summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf537/boards/pnav10.c
diff options
context:
space:
mode:
authorDanny Kukawka <danny.kukawka@bisect.de>2012-02-16 07:09:30 +0000
committerBob Liu <lliubbo@gmail.com>2012-03-21 11:00:08 +0800
commit0eceb82f55a9e3756cada9e60ecc3a9b7b5979f5 (patch)
treea924942f3a9248a952b6060e111f280d21b999e5 /arch/blackfin/mach-bf537/boards/pnav10.c
parentdd47ba13786f22893d08747c152a2cf1435d0d8c (diff)
downloadop-kernel-dev-0eceb82f55a9e3756cada9e60ecc3a9b7b5979f5.zip
op-kernel-dev-0eceb82f55a9e3756cada9e60ecc3a9b7b5979f5.tar.gz
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/pnav10.c')
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 6fd8470..e9507fe 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -535,9 +535,8 @@ void __init native_machine_early_platform_add_devices(void)
ARRAY_SIZE(stamp_early_devices));
}
-void bfin_get_ether_addr(char *addr)
+int bfin_get_ether_addr(char *addr)
{
- random_ether_addr(addr);
- printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
+ return 1;
}
EXPORT_SYMBOL(bfin_get_ether_addr);
OpenPOWER on IntegriCloud