---

yaml --- r: 145133 b: refs/heads/master c: 4f0611a h: refs/heads/master i: 145131: 5f55e2b v: v3
git-mirror · May 18, 2009 · 829f5dc · 829f5dc
1 parent 3a389d3
commit 829f5dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a598f6aebea2481531b0757ed90cfb0d8cf1d8f5
+refs/heads/master: 4f0611af47e25807cf18cd2b4d4e94206c75b29e
diff --git a/trunk/net/bridge/br_stp.c b/trunk/net/bridge/br_stp.c
@@ -297,6 +297,9 @@ void br_topology_change_detection(struct net_bridge *br)
 {
 	int isroot = br_is_root_bridge(br);
 
+	if (br->stp_enabled != BR_KERNEL_STP)
+		return;
+
 	pr_info("%s: topology change detected, %s\n", br->dev->name,
 		isroot ? "propagating" : "sending tcn bpdu");