bridge: make ifla_br_policy and br_af_ops static

[karo-tx-linux.git] / net / bridge / br_stp_if.c

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 7b5197c7de1324a59a8563a1632652ec25403159..0bdb4ebd362b7818229bb50f13d25f7e1181dcad 100644 (file)
--- 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) {