hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adi: adapt to eth_hw_addr_random() and changes in arch/blackfin 

Adapt adi ethernet driver to changes in bfin_get_ether_addr()
from arch/blackfin. bfin_get_ether_addr() returns now a state.
Set a random mac address via new eth_hw_addr_random() in case
the return value is not 0.

Reset the state to NET_ADDR_PERM as soon as the MAC get
changed via .ndo_set_mac_address.

v2: change the logic to reduce unneeded checks

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-16 07:09:31 +00:00 committed by David S. Miller
parent fa63c6da22
commit 5055d2f236
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/adi/bfin_mac.c
View File

@ -621,6 +621,7 @@ static int bfin_mac_set_mac_address(struct net_device *dev, void *p)
if (netif_running(dev)) if (netif_running(dev))
return -EBUSY; return -EBUSY;
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
dev->addr_assign_type &= ~NET_ADDR_RANDOM;
setup_mac_addr(dev->dev_addr); setup_mac_addr(dev->dev_addr);
return 0; return 0;
} }
@ -1494,12 +1495,14 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev)
* Grab the MAC from the board somehow * Grab the MAC from the board somehow
* this is done in the arch/blackfin/mach-bfxxx/boards/eth_mac.c * this is done in the arch/blackfin/mach-bfxxx/boards/eth_mac.c
*/ */
if (!is_valid_ether_addr(ndev->dev_addr)) if (!is_valid_ether_addr(ndev->dev_addr)) {
bfin_get_ether_addr(ndev->dev_addr); if (bfin_get_ether_addr(ndev->dev_addr) ||
!is_valid_ether_addr(ndev->dev_addr)) {
/* If still not valid, get a random one */ /* Still not valid, get a random one */
if (!is_valid_ether_addr(ndev->dev_addr)) netdev_warn(ndev, "Setting Ethernet MAC to a random one\n");
random_ether_addr(ndev->dev_addr); eth_hw_addr_random(ndev);
}
}
setup_mac_addr(ndev->dev_addr); setup_mac_addr(ndev->dev_addr);

2
drivers/net/ethernet/adi/bfin_mac.h
View File

@ -101,6 +101,6 @@ struct bfin_mac_local {
#endif #endif
}; };
extern void bfin_get_ether_addr(char *addr); extern int bfin_get_ether_addr(char *addr);
#endif #endif