X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_stp.c;h=0660515f3992fe460c8a0de96c7d3632aec707c3;hb=45d60e3648eaba1f5f6976df901fb7c45660fb49;hp=6e63ec3f1fcfc1f646eeee4fc0454bf79e69396f;hpb=8d7ccaa545490cdffdfaff0842436a8dd85cf47b;p=~andy%2Flinux

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 6e63ec3f1fc..0660515f399 100644
--- a/net/bridge/br_stp.c
+++ b/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");