diff options
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/ethoc.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/lantiq_etop.c | 2 | ||||
-rw-r--r-- | include/linux/etherdevice.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 56d3f697e0c7..17651c779680 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -2540,7 +2540,7 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2540 | } | 2540 | } |
2541 | if (atl1c_read_mac_addr(&adapter->hw)) { | 2541 | if (atl1c_read_mac_addr(&adapter->hw)) { |
2542 | /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ | 2542 | /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ |
2543 | netdev->addr_assign_type |= NET_ADDR_RANDOM; | 2543 | netdev->addr_assign_type = NET_ADDR_RANDOM; |
2544 | } | 2544 | } |
2545 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); | 2545 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); |
2546 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); | 2546 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); |
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 71b3d7daa21d..5b0d9931c720 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c | |||
@@ -3053,7 +3053,7 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3053 | /* copy the MAC address out of the EEPROM */ | 3053 | /* copy the MAC address out of the EEPROM */ |
3054 | if (atl1_read_mac_addr(&adapter->hw)) { | 3054 | if (atl1_read_mac_addr(&adapter->hw)) { |
3055 | /* mark random mac */ | 3055 | /* mark random mac */ |
3056 | netdev->addr_assign_type |= NET_ADDR_RANDOM; | 3056 | netdev->addr_assign_type = NET_ADDR_RANDOM; |
3057 | } | 3057 | } |
3058 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); | 3058 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); |
3059 | 3059 | ||
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c index 8db1c06008de..f380bb7653dd 100644 --- a/drivers/net/ethernet/ethoc.c +++ b/drivers/net/ethernet/ethoc.c | |||
@@ -1068,7 +1068,7 @@ static int ethoc_probe(struct platform_device *pdev) | |||
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | if (random_mac) | 1070 | if (random_mac) |
1071 | netdev->addr_assign_type |= NET_ADDR_RANDOM; | 1071 | netdev->addr_assign_type = NET_ADDR_RANDOM; |
1072 | 1072 | ||
1073 | /* register MII bus */ | 1073 | /* register MII bus */ |
1074 | priv->mdio = mdiobus_alloc(); | 1074 | priv->mdio = mdiobus_alloc(); |
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index c124e67a1a1c..cd3d2c09cdd0 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c | |||
@@ -655,7 +655,7 @@ ltq_etop_init(struct net_device *dev) | |||
655 | 655 | ||
656 | /* Set addr_assign_type here, ltq_etop_set_mac_address would reset it. */ | 656 | /* Set addr_assign_type here, ltq_etop_set_mac_address would reset it. */ |
657 | if (random_mac) | 657 | if (random_mac) |
658 | dev->addr_assign_type |= NET_ADDR_RANDOM; | 658 | dev->addr_assign_type = NET_ADDR_RANDOM; |
659 | 659 | ||
660 | ltq_etop_set_multicast_list(dev); | 660 | ltq_etop_set_multicast_list(dev); |
661 | err = ltq_etop_mdio_init(dev); | 661 | err = ltq_etop_mdio_init(dev); |
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 243eea1e33d8..1a43e1b4f7ad 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h | |||
@@ -192,7 +192,7 @@ static inline void eth_zero_addr(u8 *addr) | |||
192 | */ | 192 | */ |
193 | static inline void eth_hw_addr_random(struct net_device *dev) | 193 | static inline void eth_hw_addr_random(struct net_device *dev) |
194 | { | 194 | { |
195 | dev->addr_assign_type |= NET_ADDR_RANDOM; | 195 | dev->addr_assign_type = NET_ADDR_RANDOM; |
196 | eth_random_addr(dev->dev_addr); | 196 | eth_random_addr(dev->dev_addr); |
197 | } | 197 | } |
198 | 198 | ||