Message ID | 20120307082522.6293.26893.stgit@localhost.localdomain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Paulius Zaleckas <paulius.zaleckas@gmail.com> Date: Wed, 07 Mar 2012 10:25:22 +0200 > Now we have: > eth0: link *down* > br0: port 1(eth0) entered *forwarding* state > > br_log_state(p) should be called *after* p->state is set > to BR_STATE_DISABLED. > > Reported-by: Zilvinas Valinskas <zilvinas@wilibox.com> > Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> > Acked-by: Stephen Hemminger <shemminger@vyatta.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 19308e3..f494496 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -98,14 +98,13 @@ void br_stp_disable_port(struct net_bridge_port *p) struct net_bridge *br = p->br; int wasroot; - br_log_state(p); - wasroot = br_is_root_bridge(br); br_become_designated_port(p); p->state = BR_STATE_DISABLED; p->topology_change_ack = 0; p->config_pending = 0; + br_log_state(p); br_ifinfo_notify(RTM_NEWLINK, p); del_timer(&p->message_age_timer);