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>

1 files changed, 2 insertions, 1 deletions

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;