diff options
author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-16 02:09:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-19 19:02:42 -0500 |
commit | fa63c6da22b4a6ea6e7d04e3dc9178dd72304903 (patch) | |
tree | 6b3ece0cb2f9648c04089ed610e823cd96af258d /arch/blackfin/mach-bf537/boards/cm_bf537u.c | |
parent | 772301b6187a88359b9514bdd023becf31e7f013 (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>
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/cm_bf537u.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537u.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c index f5536982706c..3f3abad86ec3 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c | |||
@@ -790,9 +790,8 @@ void __init native_machine_early_platform_add_devices(void) | |||
790 | ARRAY_SIZE(cm_bf537u_early_devices)); | 790 | ARRAY_SIZE(cm_bf537u_early_devices)); |
791 | } | 791 | } |
792 | 792 | ||
793 | void bfin_get_ether_addr(char *addr) | 793 | int bfin_get_ether_addr(char *addr) |
794 | { | 794 | { |
795 | random_ether_addr(addr); | 795 | return 1; |
796 | printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); | ||
797 | } | 796 | } |
798 | EXPORT_SYMBOL(bfin_get_ether_addr); | 797 | EXPORT_SYMBOL(bfin_get_ether_addr); |