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

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

net: use eth_hw_addr_random() and reset addr_assign_type 



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.

v2: adapt to renamed eth_hw_addr_random()

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

drivers/net/dummy.c

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static int dummy_set_address(struct net_device *dev, void *p) 
	if (!is_valid_ether_addr(sa->sa_data))

		return -EADDRNOTAVAIL;



	dev->addr_assign_type &= ~NET_ADDR_RANDOM;

	memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN);

	return 0;

}
@@ -135,7 +136,7 @@ static void dummy_setup(struct net_device *dev) 
	dev->flags &= ~IFF_MULTICAST;

	dev->features	|= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO;

	dev->features	|= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;

	random_ether_addr(dev->dev_addr);

	eth_hw_addr_random(dev);

}



static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+1 −0
Original line number Diff line number Diff line
@@ -3007,6 +3007,7 @@ int bnx2x_change_mac_addr(struct net_device *dev, void *p) 
			return rc;

	}



	dev->addr_assign_type &= ~NET_ADDR_RANDOM;

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



	if (netif_running(dev))

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -9683,7 +9683,7 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp) 


	if (BP_NOMCP(bp)) {

		BNX2X_ERROR("warning: random MAC workaround active\n");

		random_ether_addr(bp->dev->dev_addr);

		eth_hw_addr_random(bp->dev);

	} else if (IS_MF(bp)) {

		val2 = MF_CFG_RD(bp, func_mf_config[func].mac_upper);

		val = MF_CFG_RD(bp, func_mf_config[func].mac_lower);

drivers/net/ethernet/calxeda/xgmac.c

+2 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static int xgmac_open(struct net_device *dev) 
	 * address using the following linux command:

	 *      ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx  */

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

		random_ether_addr(dev->dev_addr);

		eth_hw_addr_random(dev);

		netdev_dbg(priv->dev, "generated random MAC address %pM\n",

			dev->dev_addr);

	}
@@ -1482,6 +1482,7 @@ static int xgmac_set_mac_address(struct net_device *dev, void *p) 
	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	dev->addr_assign_type &= ~NET_ADDR_RANDOM;

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



	xgmac_set_mac_addr(ioaddr, dev->dev_addr, 0);

drivers/net/ethernet/marvell/pxa168_eth.c

+2 −1
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ static int pxa168_eth_set_mac_address(struct net_device *dev, void *addr) 
	if (!is_valid_ether_addr(sa->sa_data))

		return -EINVAL;

	memcpy(oldMac, dev->dev_addr, ETH_ALEN);

	dev->addr_assign_type &= ~NET_ADDR_RANDOM;

	memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN);

	netif_addr_lock_bh(dev);

	update_hash_table_mac_address(pep, oldMac, dev->dev_addr);
@@ -1520,7 +1521,7 @@ static int pxa168_eth_probe(struct platform_device *pdev) 
	INIT_WORK(&pep->tx_timeout_task, pxa168_eth_tx_timeout_task);



	printk(KERN_INFO "%s:Using random mac address\n", DRIVER_NAME);

	random_ether_addr(dev->dev_addr);

	eth_hw_addr_random(dev);



	pep->pd = pdev->dev.platform_data;

	pep->rx_ring_size = NUM_RX_DESCS;