From 8ea2b419b1a0f22e69d9bc07b687a1dd7adbe609 Mon Sep 17 00:00:00 2001
From: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Date: Tue, 6 Mar 2012 22:25:22 +0000
Subject: [PATCH] --- yaml --- r: 288369 b: refs/heads/master c:
 5200959b833ddacf28b6ffce8c331dfd6e0ca797 h: refs/heads/master i:   288367:
 a01c7e87555e96db46a9d6c75592512c41f413e5 v: v3

---
 [refs]                       | 2 +-
 trunk/net/bridge/br_stp_if.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 41dbd58a0453..a94b1fe3fcd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9e179ecec0805c41b17f9a0c3b925d415677772
+refs/heads/master: 5200959b833ddacf28b6ffce8c331dfd6e0ca797
diff --git a/trunk/net/bridge/br_stp_if.c b/trunk/net/bridge/br_stp_if.c
index 19308e305d85..f494496373d6 100644
--- a/trunk/net/bridge/br_stp_if.c
+++ b/trunk/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);