aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_stp_if.c
diff options
context:
space:
mode:
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 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)
216 struct net_bridge_port *p; 216 struct net_bridge_port *p;
217 217
218 /* user has chosen a value so keep it */ 218 /* user has chosen a value so keep it */
219 if (br->flags & BR_SET_MAC_ADDR) 219 if (br->dev->addr_assign_type == NET_ADDR_SET)
220 return false; 220 return false;
221 221
222 list_for_each_entry(p, &br->port_list, list) { 222 list_for_each_entry(p, &br->port_list, list) {