summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_device.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-02-10 12:41:01 +0100
committerDavid S. Miller <davem@davemloft.net>2013-02-11 20:16:26 +0100
commitb2748267d6487857f1400dc42748c5409e0ee130 (patch)
tree76b5c6ec2d734607d3bbc01d87348d44ce5c84df /net/bridge/br_device.c
parentipv6: by default join ff01::1 and in case of forwarding ff01::2 and ff05:2 (diff)
downloadlinux-b2748267d6487857f1400dc42748c5409e0ee130.tar.xz
linux-b2748267d6487857f1400dc42748c5409e0ee130.zip
bridge: use dev->addr_assign_type to see if user change mac
And remove no longer used br->flags. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Acked-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
-rw-r--r--net/bridge/br_device.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index e1bc090bc00a..ba6fb2d60940 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -176,7 +176,6 @@ static int br_set_mac_address(struct net_device *dev, void *p)
br_fdb_change_mac_address(br, addr->sa_data);
br_stp_change_bridge_id(br, addr->sa_data);
}
- br->flags |= BR_SET_MAC_ADDR;
spin_unlock_bh(&br->lock);
return 0;