diff --git a/[refs] b/[refs]
index b933d287be65..31253f1a7d5f 100644
--- 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
index 6e63ec3f1fcf..0660515f3992 100644
--- 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");