net: use eth_hw_addr_random() and reset addr_assign_type

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / ethernet / marvell / pxa168_eth.c

diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 75df2091bd2e7a445513dd44cdb3c5fc072e3df0..83e37ad113e03aa616e1d4c83b3898b2727290d9 100644 (file)
--- 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;