net: use eth_hw_addr_random() and reset addr_assign_type

[deliverable/linux.git] / net / bridge / br_device.c

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 71773b014e0ce5a05db8c3acdaa2d0b680314415..a157bf827d87b13d548c74a36714cc14284bb5fb 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -171,6 +171,7 @@ static int br_set_mac_address(struct net_device *dev, void *p)
 
        spin_lock_bh(&br->lock);
        if (compare_ether_addr(dev->dev_addr, addr->sa_data)) {
+               dev->addr_assign_type &= ~NET_ADDR_RANDOM;
                memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
                br_fdb_change_mac_address(br, addr->sa_data);
                br_stp_change_bridge_id(br, addr->sa_data);
@@ -334,7 +335,7 @@ void br_dev_setup(struct net_device *dev)
 {
        struct net_bridge *br = netdev_priv(dev);
 
-       random_ether_addr(dev->dev_addr);
+       eth_hw_addr_random(dev);
        ether_setup(dev);
 
        dev->netdev_ops = &br_netdev_ops;