summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_stp_if.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-02-10 11:41:01 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-11 14:16:26 -0500
commitb2748267d6487857f1400dc42748c5409e0ee130 (patch)
tree76b5c6ec2d734607d3bbc01d87348d44ce5c84df /net/bridge/br_stp_if.c
parent2c5e89338493882719f8d138f8f2717ee9a04153 (diff)
downloadop-kernel-dev-b2748267d6487857f1400dc42748c5409e0ee130.zip
op-kernel-dev-b2748267d6487857f1400dc42748c5409e0ee130.tar.gz
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_stp_if.c')
-rw-r--r--net/bridge/br_stp_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 7b5197c..0bdb4eb 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) {
OpenPOWER on IntegriCloud