1 files changed, 2 insertions, 2 deletions

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 9d5a414a3943..0bdb4ebd362b 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -54,7 +54,7 @@ void br_stp_enable_bridge(struct net_bridge *br)
         br_config_bpdu_generation(br);
 
         list_for_each_entry(p, &br->port_list, list) {
-                if ((p->dev->flags & IFF_UP) && netif_carrier_ok(p->dev))
+                if (netif_running(p->dev) && netif_oper_up(p->dev))
                         br_stp_enable_port(p);
 
         }
@@ -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) {