patch bridge-no-topology-change-when-no-stp.patch

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 6e63ec3f1fcfc1f646eeee4fc0454bf79e69396f..3055de93e414cdc5d854f1a67d66306b616d03e1 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -375,7 +375,8 @@ static void br_make_forwarding(struct net_bridge_port *p)
 
        if (br->forward_delay == 0) {
                p->state = BR_STATE_FORWARDING;
-               br_topology_change_detection(br);
+               if (p->br->stp_enabled)
+                       br_topology_change_detection(br);
                del_timer(&p->forward_delay_timer);
        }
        else if (p->br->stp_enabled == BR_KERNEL_STP)