[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20070418062750.GF11308@lixom.net>
Date: Wed, 18 Apr 2007 01:27:50 -0500
From: olof@...om.net (Olof Johansson)
To: jgarzik@...ox.com
Cc: netdev@...r.kernel.org, linuxppc-dev@...abs.org
Subject: [PATCH] [5/5] [v2] pasemi_mac: use local-mac-address
Use local-mac-address in the device tree instead. Fall back to mac-address
for older firmware.
Signed-off-by: Olof Johansson <olof@...om.net>
Index: powerpc/drivers/net/pasemi_mac.c
===================================================================
--- powerpc.orig/drivers/net/pasemi_mac.c
+++ powerpc/drivers/net/pasemi_mac.c
@@ -74,7 +74,12 @@ static int pasemi_get_mac_addr(struct pa
return -ENOENT;
}
- maddr = get_property(dn, "mac-address", NULL);
+ maddr = get_property(dn, "local-mac-address", NULL);
+
+ /* Fall back to mac-address for older firmware */
+ if (maddr == NULL)
+ maddr = get_property(dn, "mac-address", NULL);
+
if (maddr == NULL) {
dev_warn(&pdev->dev,
"no mac address in device tree, not configuring\n");
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists