Skip to content

Commit

Permalink
bridge: fix state reporting when port is disabled
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
pauliuszaleckas authored and davem330 committed Mar 8, 2012
1 parent d9e179e commit 5200959
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions net/bridge/br_stp_if.c
Expand Up @@ -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);
Expand Down

0 comments on commit 5200959

Please sign in to comment.