---

yaml --- r: 369903 b: refs/heads/master c: 91bc033 h: refs/heads/master i: 369901: ccab770 369899: a2f727a 369895: 80fb3f3 369887: d9cb189 v: v3
git-mirror · Apr 30, 2013 · c510b4c · c510b4c
1 parent f00c105
commit c510b4c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dcf313a7a68adc9a060e4e41a55245c0f9a3d31
+refs/heads/master: 91bc033c4d01656e3d8e45a13fd58924a3099693
diff --git a/trunk/net/bridge/br_stp.c b/trunk/net/bridge/br_stp.c
@@ -225,7 +225,14 @@ static void br_record_config_timeout_values(struct net_bridge *br,
 /* called under bridge lock */
 void br_transmit_tcn(struct net_bridge *br)
 {
-	br_send_tcn_bpdu(br_get_port(br, br->root_port));
+	struct net_bridge_port *p;
+
+	p = br_get_port(br, br->root_port);
+	if (p)
+		br_send_tcn_bpdu(p);
+	else
+		br_notice(br, "root port %u not found for topology notice\n",
+			  br->root_port);
 }
 
 /* called under bridge lock */