aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-01-26 14:55:09 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-01-26 14:55:09 +0000
commit6bea544949ce683dfb1d95bbc8510a397e0e1dd2 (patch)
treeb4b53c8d336e486d6cd4b5c697402f8dc5f679e1 /target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
parenta43685367ef84a5579aae53ceb33797e6209a43d (diff)
downloadupstream-6bea544949ce683dfb1d95bbc8510a397e0e1dd2.tar.gz
upstream-6bea544949ce683dfb1d95bbc8510a397e0e1dd2.tar.bz2
upstream-6bea544949ce683dfb1d95bbc8510a397e0e1dd2.zip
move random MAC address generation into the platform initialization code
SVN-Revision: 14204
Diffstat (limited to 'target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 58e3b11518..8921639ab8 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -868,16 +868,9 @@ static int __init ag71xx_probe(struct platform_device *pdev)
ag->oom_timer.data = (unsigned long) dev;
ag->oom_timer.function = ag71xx_oom_timer_handler;
- netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
+ memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
- if (is_valid_ether_addr(pdata->mac_addr))
- memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
- else {
- dev->dev_addr[0] = 0xde;
- dev->dev_addr[1] = 0xad;
- get_random_bytes(&dev->dev_addr[2], 3);
- dev->dev_addr[5] = pdev->id & 0xff;
- }
+ netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
err = register_netdev(dev);
if (err) {