diff options
| author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-16 07:09:30 +0000 |
|---|---|---|
| committer | Bob Liu <lliubbo@gmail.com> | 2012-03-21 11:00:08 +0800 |
| commit | 0eceb82f55a9e3756cada9e60ecc3a9b7b5979f5 (patch) | |
| tree | a924942f3a9248a952b6060e111f280d21b999e5 /arch/blackfin/mach-bf537/boards/stamp.c | |
| parent | dd47ba13786f22893d08747c152a2cf1435d0d8c (diff) | |
| download | talos-obmc-linux-0eceb82f55a9e3756cada9e60ecc3a9b7b5979f5.tar.gz talos-obmc-linux-0eceb82f55a9e3756cada9e60ecc3a9b7b5979f5.zip | |
arch/blackfin: don't generate random mac in bfin_get_ether_addr()
Changed bfin_get_ether_addr() to return a state and to
set no random mac address if the board don't provide one.
Let the caller of bfin_get_ether_addr() set a random mac
address if the return value is not 0.
v2: don't set random mac in bfin_get_ether_addr()
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/stamp.c')
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index f2c0629f22c2..f3562b0922af 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c @@ -3013,9 +3013,10 @@ void native_machine_restart(char *cmd) * Currently the MAC address is saved in Flash by U-Boot */ #define FLASH_MAC 0x203f0000 -void bfin_get_ether_addr(char *addr) +int bfin_get_ether_addr(char *addr) { *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC); *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4); + return 0; } EXPORT_SYMBOL(bfin_get_ether_addr); |
