Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5055d2f2 authored by Danny Kukawka's avatar Danny Kukawka Committed by David S. Miller
Browse files

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: default avatarDanny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa63c6da

drivers/net/ethernet/adi/bfin_mac.c

+9 −6
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ static int bfin_mac_set_mac_address(struct net_device *dev, void *p) 
	if (netif_running(dev))

		return -EBUSY;

	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	dev->addr_assign_type &= ~NET_ADDR_RANDOM;

	setup_mac_addr(dev->dev_addr);

	return 0;

}
@@ -1494,12 +1495,14 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) 
	 * Grab the MAC from the board somehow

	 * this is done in the arch/blackfin/mach-bfxxx/boards/eth_mac.c

	 */

	if (!is_valid_ether_addr(ndev->dev_addr))

		bfin_get_ether_addr(ndev->dev_addr);



	/* If still not valid, get a random one */

	if (!is_valid_ether_addr(ndev->dev_addr))

		random_ether_addr(ndev->dev_addr);

	if (!is_valid_ether_addr(ndev->dev_addr)) {

		if (bfin_get_ether_addr(ndev->dev_addr) ||

		     !is_valid_ether_addr(ndev->dev_addr)) {

			/* Still not valid, get a random one */

			netdev_warn(ndev, "Setting Ethernet MAC to a random one\n");

			eth_hw_addr_random(ndev);

		}

	}



	setup_mac_addr(ndev->dev_addr);

drivers/net/ethernet/adi/bfin_mac.h

+1 −1
Original line number Diff line number Diff line
@@ -101,6 +101,6 @@ struct bfin_mac_local { 
#endif

};



extern void bfin_get_ether_addr(char *addr);

extern int bfin_get_ether_addr(char *addr);



#endif