Merge tag 'nios2-fixes-v4.0-final' of git://git.rocketboards.org/linux-socfpga-next

[firefly-linux-kernel-4.4.55.git] / net / bridge / br_stp_if.c

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 189ba1e7d8515945db5593c053b7751d36a02d3b..41146872c1b47ca6ee3ac48c14e672a9743273d4 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -37,7 +37,7 @@ void br_init_port(struct net_bridge_port *p)
 {
        p->port_id = br_make_port_id(p->priority, p->port_no);
        br_become_designated_port(p);
-       p->state = BR_STATE_BLOCKING;
+       br_set_state(p, BR_STATE_BLOCKING);
        p->topology_change_ack = 0;
        p->config_pending = 0;
 }
@@ -100,7 +100,7 @@ void br_stp_disable_port(struct net_bridge_port *p)
 
        wasroot = br_is_root_bridge(br);
        br_become_designated_port(p);
-       p->state = BR_STATE_DISABLED;
+       br_set_state(p, BR_STATE_DISABLED);
        p->topology_change_ack = 0;
        p->config_pending = 0;