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>

3 files changed, 5 insertions, 2 deletions

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;