---

yaml --- r: 288369 b: refs/heads/master c: 5200959 h: refs/heads/master i: 288367: a01c7e8 v: v3
git-mirror · Mar 8, 2012 · 8ea2b41 · 8ea2b41
1 parent 8fb0a69
commit 8ea2b41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);