Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

[~andy/linux] / net / batman-adv / soft-interface.c

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 3ba057d935218b73ebcf211261d094be57a71226..a5590f4193f1f731cb9a562e952e72f02ed85d0e 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -540,6 +540,7 @@ static int interface_set_mac_addr(struct net_device *dev, void *p)
        }
 
        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+       dev->addr_assign_type &= ~NET_ADDR_RANDOM;
        return 0;
 }
 
@@ -782,7 +783,6 @@ static const struct net_device_ops bat_netdev_ops = {
 static void interface_setup(struct net_device *dev)
 {
        struct bat_priv *priv = netdev_priv(dev);
-       char dev_addr[ETH_ALEN];
 
        ether_setup(dev);
 
@@ -799,8 +799,7 @@ static void interface_setup(struct net_device *dev)
        dev->hard_header_len = BAT_HEADER_LEN;
 
        /* generate random address */
-       random_ether_addr(dev_addr);
-       memcpy(dev->dev_addr, dev_addr, ETH_ALEN);
+       eth_hw_addr_random(dev);
 
        SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);