]> err.no Git - linux-2.6/commitdiff
[POWERPC] bootwrapper: Only print MAC addresses when the node is actually present
authorScott Wood <scottwood@freescale.com>
Wed, 5 Sep 2007 19:21:18 +0000 (05:21 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 13 Sep 2007 15:33:23 +0000 (01:33 +1000)
Some firmwares (such as PlanetCore) only provide a base MAC address, and
expect the kernel to set certain bits to generate the addresses for the
other ports.  As such, MAC addresses are generated that may not correspond
to actual hardware.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/boot/devtree.c

index e1b8122b4393cc9873a76378a64ebd04deda9d1d..549463bf5eec2dc978fe56fe702965037b6b221e 100644 (file)
@@ -100,12 +100,14 @@ void __dt_fixup_mac_addresses(u32 startindex, ...)
                devp = find_node_by_prop_value(NULL, "linux,network-index",
                                               (void*)&index, sizeof(index));
 
-               printf("ENET%d: local-mac-address <-"
-                      " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
-                      addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+               if (devp) {
+                       printf("ENET%d: local-mac-address <-"
+                              " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
+                              addr[0], addr[1], addr[2],
+                              addr[3], addr[4], addr[5]);
 
-               if (devp)
                        setprop(devp, "local-mac-address", addr, 6);
+               }
 
                index++;
        }