From: Paulius Zaleckas <paulius.zaleckas@gmail.com>
To: bridge@lists.linux-foundation.org, netdev@vger.kernel.org
Subject: [PATCH 2/2] bridge: fix state reporting when port is disabled
Date: Wed, 07 Mar 2012 10:25:22 +0200 [thread overview]
Message-ID: <20120307082522.6293.26893.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120307082514.6293.59158.stgit@localhost.localdomain>
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>
---
net/bridge/br_stp_if.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
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);
next prev parent reply other threads:[~2012-03-07 8:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 8:25 [PATCH 1/2] bridge: br_log_state() s/entering/entered/ Paulius Zaleckas
2012-03-07 8:25 ` Paulius Zaleckas [this message]
2012-03-08 8:25 ` [PATCH 2/2] bridge: fix state reporting when port is disabled David Miller
2012-03-08 8:25 ` [PATCH 1/2] bridge: br_log_state() s/entering/entered/ David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120307082522.6293.26893.stgit@localhost.localdomain \
--to=paulius.zaleckas@gmail.com \
--cc=bridge@lists.linux-foundation.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).