OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pasemi_mac: Use local-mac-address instead of mac-address if available 

Use local-mac-address in the device tree instead. Fall back to mac-address
for older firmware.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Olof Johansson 2007-05-08 00:48:02 -05:00 committed by Jeff Garzik
parent bb6e959079
commit a5fd22ebc7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/pasemi_mac.c
View File

@ -94,7 +94,12 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
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");