diff options
| author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-16 08:09:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-20 01:02:42 +0100 |
| commit | fa63c6da22b4a6ea6e7d04e3dc9178dd72304903 (patch) | |
| tree | 6b3ece0cb2f9648c04089ed610e823cd96af258d /arch/blackfin/mach-bf527/boards/ezkit.c | |
| parent | ethernet: Fix typo in lantiq_etop.c (diff) | |
| download | linux-fa63c6da22b4a6ea6e7d04e3dc9178dd72304903.tar.xz linux-fa63c6da22b4a6ea6e7d04e3dc9178dd72304903.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>
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/ezkit.c')
| -rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index dfdd8e6bac72..2f9a2bd83ce4 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c @@ -1311,7 +1311,7 @@ void native_machine_restart(char *cmd) bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); } -void bfin_get_ether_addr(char *addr) +int bfin_get_ether_addr(char *addr) { /* the MAC is stored in OTP memory page 0xDF */ u32 ret; @@ -1324,5 +1324,6 @@ void bfin_get_ether_addr(char *addr) for (ret = 0; ret < 6; ++ret) addr[ret] = otp_mac_p[5 - ret]; } + return 0; } EXPORT_SYMBOL(bfin_get_ether_addr); |