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

Commit e41b2d7f authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: set dev->addr_assign_type correctly 



Not a bitfield, but a plain value.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6521516

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2540,7 +2540,7 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}

	if (atl1c_read_mac_addr(&adapter->hw)) {

		/* got a random MAC address, set NET_ADDR_RANDOM to netdev */

		netdev->addr_assign_type |= NET_ADDR_RANDOM;

		netdev->addr_assign_type = NET_ADDR_RANDOM;

	}

	memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len);

	memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len);

drivers/net/ethernet/atheros/atlx/atl1.c

+1 −1
Original line number Diff line number Diff line
@@ -3053,7 +3053,7 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* copy the MAC address out of the EEPROM */

	if (atl1_read_mac_addr(&adapter->hw)) {

		/* mark random mac */

		netdev->addr_assign_type |= NET_ADDR_RANDOM;

		netdev->addr_assign_type = NET_ADDR_RANDOM;

	}

	memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len);

drivers/net/ethernet/ethoc.c

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static int ethoc_probe(struct platform_device *pdev) 
	}



	if (random_mac)

		netdev->addr_assign_type |= NET_ADDR_RANDOM;

		netdev->addr_assign_type = NET_ADDR_RANDOM;



	/* register MII bus */

	priv->mdio = mdiobus_alloc();

drivers/net/ethernet/lantiq_etop.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ ltq_etop_init(struct net_device *dev) 


	/* Set addr_assign_type here, ltq_etop_set_mac_address would reset it. */

	if (random_mac)

		dev->addr_assign_type |= NET_ADDR_RANDOM;

		dev->addr_assign_type = NET_ADDR_RANDOM;



	ltq_etop_set_multicast_list(dev);

	err = ltq_etop_mdio_init(dev);

include/linux/etherdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static inline void eth_zero_addr(u8 *addr) 
 */

static inline void eth_hw_addr_random(struct net_device *dev)

{

	dev->addr_assign_type |= NET_ADDR_RANDOM;

	dev->addr_assign_type = NET_ADDR_RANDOM;

	eth_random_addr(dev->dev_addr);

}