diff options
author | Jiri Pirko <jiri@resnulli.us> | 2012-12-31 22:30:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-04 01:37:36 -0500 |
commit | 15c6ff3bc0ff3464a8c7efcdea09c86454571622 (patch) | |
tree | ce49a0d1f0b5f4cd075d3df0875c0bf0a44ee4ad /net/bridge | |
parent | fbdeca2d7753aa1ab929aeb77ccc46489eed02b9 (diff) |
net: remove unnecessary NET_ADDR_RANDOM "bitclean"
NET_ADDR_SET is set in dev_set_mac_address() no need to alter
dev->addr_assign_type value in drivers.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_device.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 7c78e2640190..38974f70ec7b 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c | |||
@@ -172,7 +172,6 @@ static int br_set_mac_address(struct net_device *dev, void *p) | |||
172 | 172 | ||
173 | spin_lock_bh(&br->lock); | 173 | spin_lock_bh(&br->lock); |
174 | if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) { | 174 | if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) { |
175 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; | ||
176 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); | 175 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); |
177 | br_fdb_change_mac_address(br, addr->sa_data); | 176 | br_fdb_change_mac_address(br, addr->sa_data); |
178 | br_stp_change_bridge_id(br, addr->sa_data); | 177 | br_stp_change_bridge_id(br, addr->sa_data); |