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: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

11 files changed, 19 insertions, 9 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 5d15efc2a9e2..aa14502289ce 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -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))
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index b9afd26cfbe6..8e809c1408b4 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -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);
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index 1fce186a9031..11f667f6131a 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -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);
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 75df2091bd2e..83e37ad113e0 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -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;
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 0a85690a1321..0686b93f1857 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -1080,6 +1080,7 @@ static int ks8842_set_mac(struct net_device *netdev, void *p)
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
+        netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
         memcpy(netdev->dev_addr, mac, netdev->addr_len);
 
         ks8842_write_mac_addr(adapter, mac);
@@ -1211,7 +1212,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
                 ks8842_read_mac_addr(adapter, netdev->dev_addr);
 
                 if (!is_valid_ether_addr(netdev->dev_addr))
-                        random_ether_addr(netdev->dev_addr);
+                        eth_hw_addr_random(netdev);
         }
 
         id = ks8842_read16(adapter, 32, REG_SW_ID_AND_ENABLE);
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 0930b9c950d0..42a6a20efb15 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -439,7 +439,7 @@ static void ks8851_init_mac(struct ks8851_net *ks)
                                 dev->dev_addr);
         }
 
-        random_ether_addr(dev->dev_addr);
+        eth_hw_addr_random(dev);
         ks8851_write_mac_addr(dev);
 }
 
@@ -1050,6 +1050,7 @@ static int ks8851_set_mac_address(struct net_device *dev, void *addr)
         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 ks8851_write_mac_addr(dev);
 }
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 3d9a04e7b49d..180460f4e41f 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1241,6 +1241,7 @@ static int ks_set_mac_address(struct net_device *netdev, void *paddr)
         struct sockaddr *addr = paddr;
         u8 *da;
 
+        netdev->addr_assign_type &= ~NET_ADDR_RANDOM;
         memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
 
         da = (u8 *)netdev->dev_addr;
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index 1d6b7ce3e1ee..6118bdad244f 100644
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -527,6 +527,7 @@ static int enc28j60_set_mac_address(struct net_device *dev, void *addr)
         if (!is_valid_ether_addr(address->sa_data))
                 return -EADDRNOTAVAIL;
 
+        dev->addr_assign_type &= ~NET_ADDR_RANDOM;
         memcpy(dev->dev_addr, address->sa_data, dev->addr_len);
         return enc28j60_set_hw_macaddr(dev);
 }
@@ -1575,7 +1576,7 @@ static int __devinit enc28j60_probe(struct spi_device *spi)
                 ret = -EIO;
                 goto error_irq;
         }
-        random_ether_addr(dev->dev_addr);
+        eth_hw_addr_random(dev);
         enc28j60_set_hw_macaddr(dev);
 
         /* Board setup must set the relevant edge trigger type;
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 5eeb92f87380..8561dd25db66 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -3022,6 +3022,7 @@ static int nv_set_mac_address(struct net_device *dev, void *addr)
 
         /* synchronized against open : rtnl_lock() held by caller */
         memcpy(dev->dev_addr, macaddr->sa_data, ETH_ALEN);
+        dev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
         if (netif_running(dev)) {
                 netif_tx_lock_bh(dev);
@@ -5741,7 +5742,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 dev_err(&pci_dev->dev,
                         "Invalid MAC address detected: %pM - Please complain to your hardware vendor.\n",
                         dev->dev_addr);
-                random_ether_addr(dev->dev_addr);
+                eth_hw_addr_random(dev);
                 dev_err(&pci_dev->dev,
                         "Using random MAC address: %pM\n", dev->dev_addr);
         }
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index 6a1cd2360818..4a6971027076 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1833,6 +1833,7 @@ static int smsc911x_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, ETH_ALEN);
 
         spin_lock_irq(&pdata->mac_lock);
@@ -2485,7 +2486,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
                                    "Mac Address is read from LAN911x EEPROM");
                 } else {
                         /* eeprom values are invalid, generate random MAC */
-                        random_ether_addr(dev->dev_addr);
+                        eth_hw_addr_random(dev);
                         smsc911x_set_hw_mac_address(pdata, dev->dev_addr);
                         SMSC_TRACE(pdata, probe,
                                    "MAC Address is set to random_ether_addr");
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index a8e5daaef6fa..948c4f2a2d67 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -2190,6 +2190,7 @@ static int tile_net_set_mac_address(struct net_device *dev, void *p)
 
         /* ISSUE: Note that "dev_addr" is now a pointer. */
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        dev->addr_assign_type &= ~NET_ADDR_RANDOM;
 
         return 0;
 }
@@ -2254,7 +2255,7 @@ static int tile_net_get_mac(struct net_device *dev)
                  * can't get its MAC address, we are most likely running
                  * the simulator, so let's generate a random MAC address.
                  */
-                random_ether_addr(dev->dev_addr);
+                eth_hw_addr_random(dev);
         }
 
         return 0;