diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-02-10 11:41:01 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-11 14:16:26 -0500 |
| commit | b2748267d6487857f1400dc42748c5409e0ee130 (patch) | |
| tree | 76b5c6ec2d734607d3bbc01d87348d44ce5c84df | |
| parent | 2c5e89338493882719f8d138f8f2717ee9a04153 (diff) | |
| download | lwn-b2748267d6487857f1400dc42748c5409e0ee130.tar.gz lwn-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>
| -rw-r--r-- | net/bridge/br_device.c | 1 | ||||
| -rw-r--r-- | net/bridge/br_private.h | 3 | ||||
| -rw-r--r-- | net/bridge/br_stp_if.c | 2 |
3 files changed, 1 insertions, 5 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; diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 711094aed41a..06e85d9c05aa 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -197,9 +197,6 @@ struct net_bridge bool nf_call_ip6tables; bool nf_call_arptables; #endif - unsigned long flags; -#define BR_SET_MAC_ADDR 0x00000001 - u16 group_fwd_mask; /* STP */ diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 7b5197c7de13..0bdb4ebd362b 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -216,7 +216,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br) struct net_bridge_port *p; /* user has chosen a value so keep it */ - if (br->flags & BR_SET_MAC_ADDR) + if (br->dev->addr_assign_type == NET_ADDR_SET) return false; list_for_each_entry(p, &br->port_list, list) { |