Commit 5200959b authored Mar 06, 2012 by Paulius Zaleckas Committed by David S. Miller Mar 08, 2012

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: 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>

parent d9e179ec

net/bridge/br_stp_if.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message