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

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

davinci_emac: 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.

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

Remove one memcpy from emac_dev_setmac_addr() since this is a
duplicate: it's already done some lines above.

v2: use bitops, adapt to eth_hw_addr_random, remove a memcpy

Signed-off-by: default avatarDanny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 43aabec5

drivers/net/ethernet/ti/davinci_emac.c

+3 −2
Original line number Diff line number Diff line
@@ -1259,10 +1259,10 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr) 
	/* Store mac addr in priv and rx channel and set it in EMAC hw */

	memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len);

	memcpy(ndev->dev_addr, sa->sa_data, ndev->addr_len);

	ndev->addr_assign_type &= ~NET_ADDR_RANDOM;



	/* MAC address is configured only after the interface is enabled. */

	if (netif_running(ndev)) {

		memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len);

		emac_setmac(priv, EMAC_DEF_RX_CH, priv->mac_addr);

	}
@@ -1896,7 +1896,8 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 


	if (!is_valid_ether_addr(priv->mac_addr)) {

		/* Use random MAC if none passed */

		random_ether_addr(priv->mac_addr);

		eth_hw_addr_random(ndev);

		memcpy(priv->mac_addr, ndev->dev_addr, ndev->addr_len);

		dev_warn(&pdev->dev, "using random MAC addr: %pM\n",

							priv->mac_addr);

	}