Commit 5200959b authored by Paulius Zaleckas's avatar Paulius Zaleckas Committed by David S. Miller

bridge: fix state reporting when port is disabled

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: default avatarZilvinas Valinskas <zilvinas@wilibox.com>
Signed-off-by: default avatarPaulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d9e179ec
...@@ -98,14 +98,13 @@ void br_stp_disable_port(struct net_bridge_port *p) ...@@ -98,14 +98,13 @@ void br_stp_disable_port(struct net_bridge_port *p)
struct net_bridge *br = p->br; struct net_bridge *br = p->br;
int wasroot; int wasroot;
br_log_state(p);
wasroot = br_is_root_bridge(br); wasroot = br_is_root_bridge(br);
br_become_designated_port(p); br_become_designated_port(p);
p->state = BR_STATE_DISABLED; p->state = BR_STATE_DISABLED;
p->topology_change_ack = 0; p->topology_change_ack = 0;
p->config_pending = 0; p->config_pending = 0;
br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p); br_ifinfo_notify(RTM_NEWLINK, p);
del_timer(&p->message_age_timer); del_timer(&p->message_age_timer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment