UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

au1000_eth: use eth_hw_addr_random() instead of random_ether_addr() 

Use eth_hw_addr_random() instead of calling random_ether_addr()
to set addr_assign_type correctly to NET_ADDR_RANDOM.

v2: adapt to eth_hw_addr_random()

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Danny Kukawka 2012-02-17 05:43:22 +00:00 committed by David S. Miller
parent 3ccdca7775
commit 7718f2c27d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/amd/au1000_eth.c
View File

@ -1129,9 +1129,6 @@ static int __devinit au1000_probe(struct platform_device *pdev)
au1000_setup_hw_rings(aup, aup->macdma); au1000_setup_hw_rings(aup, aup->macdma);
/* set a random MAC now in case platform_data doesn't provide one */
random_ether_addr(dev->dev_addr);
writel(0, aup->enable); writel(0, aup->enable);
aup->mac_enabled = 0; aup->mac_enabled = 0;
@ -1141,8 +1138,12 @@ static int __devinit au1000_probe(struct platform_device *pdev)
" PHY search on MAC0\n"); " PHY search on MAC0\n");
aup->phy1_search_mac0 = 1; aup->phy1_search_mac0 = 1;
} else { } else {
if (is_valid_ether_addr(pd->mac)) if (is_valid_ether_addr(pd->mac)) {
memcpy(dev->dev_addr, pd->mac, 6); memcpy(dev->dev_addr, pd->mac, 6);
} else {
/* Set a random MAC since no valid provided by platform_data. */
eth_hw_addr_random(dev);
}
aup->phy_static_config = pd->phy_static_config; aup->phy_static_config = pd->phy_static_config;
aup->phy_search_highest_addr = pd->phy_search_highest_addr; aup->phy_search_highest_addr = pd->phy_search_highest_addr;