The following commit has been merged in the merge/master branch: commit ae926bc6cd9e569e8a16b20187444bfea5bcd591 Merge: 9ab5287fbffe88a2f6bd88c7a3421c60d4945e2b 2e52993f98abca5bdf181b81fb11f7c728ba6cf0 Author: Marek Lindner lindner_marek@yahoo.de Date: Tue Feb 28 14:07:41 2012 +0800
Merge remote-tracking branch 'origin/standalone/next' into merge/master
Conflicts: net/batman-adv/compat.h
diff --combined net/batman-adv/soft-interface.c index 2ffdc74,37fbcb5..37fbcb5 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -541,6 -541,7 +541,7 @@@ static int interface_set_mac_addr(struc }
memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + dev->addr_assign_type &= ~NET_ADDR_RANDOM; return 0; }
@@@ -783,7 -784,6 +784,6 @@@ static const struct net_device_ops bat_ static void interface_setup(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN];
ether_setup(dev);
@@@ -800,8 -800,7 +800,7 @@@ 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);