diff options
| author | Olof Johansson <olof@lixom.net> | 2007-05-08 00:48:02 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-08 01:48:19 -0400 |
| commit | a5fd22ebc71eecb7b61e542d34ac50a417b3031b (patch) | |
| tree | 9393aa01f5f55f24b070ab0c465c3b73d68bc036 /drivers/net/pasemi_mac.c | |
| parent | bb6e9590792834f905a92e439a083254649c985c (diff) | |
| download | linux-a5fd22ebc71eecb7b61e542d34ac50a417b3031b.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/pasemi_mac.c')
| -rw-r--r-- | drivers/net/pasemi_mac.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 78b127c404e9..b8f976bd60fd 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c @@ -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"); |