diff options
author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-16 02:09:30 -0500 |
---|---|---|
committer | Bob Liu <lliubbo@gmail.com> | 2012-03-20 23:00:08 -0400 |
commit | 0eceb82f55a9e3756cada9e60ecc3a9b7b5979f5 (patch) | |
tree | a924942f3a9248a952b6060e111f280d21b999e5 /arch/blackfin/mach-bf537/boards/dnp5370.c | |
parent | dd47ba13786f22893d08747c152a2cf1435d0d8c (diff) |
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/dnp5370.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/dnp5370.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c index 11dadeb33d79..6f77bf708ec0 100644 --- a/arch/blackfin/mach-bf537/boards/dnp5370.c +++ b/arch/blackfin/mach-bf537/boards/dnp5370.c | |||
@@ -399,9 +399,10 @@ arch_initcall(dnp5370_init); | |||
399 | /* | 399 | /* |
400 | * Currently the MAC address is saved in Flash by U-Boot | 400 | * Currently the MAC address is saved in Flash by U-Boot |
401 | */ | 401 | */ |
402 | void bfin_get_ether_addr(char *addr) | 402 | int bfin_get_ether_addr(char *addr) |
403 | { | 403 | { |
404 | *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC); | 404 | *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC); |
405 | *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4); | 405 | *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4); |
406 | return 0; | ||
406 | } | 407 | } |
407 | EXPORT_SYMBOL(bfin_get_ether_addr); | 408 | EXPORT_SYMBOL(bfin_get_ether_addr); |