[Bridge] [PATCH 2.4/2.5] skip the LISTENING STP state if STP is disabled..

[Lennert Buytenhek]

..as this state is only used for detecting other STP partners,
but we're not going to speak STP anyway.


--- linux-2.4.19-stpfix/net/bridge/br_stp.c.orig        Wed Jan 23 13:35:29 2002
+++ linux-2.4.19-stpfix/net/bridge/br_stp.c     Wed Jan 23 13:36:23 2002
@@ -369,10 +369,19 @@
 static void br_make_forwarding(struct net_bridge_port *p)
 {
        if (p->state == BR_STATE_BLOCKING) {
-               printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
-                      p->br->dev.name, p->port_no, p->dev->name, "listening");
+               if (p->br->stp_enabled) {
+                       printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
+                              p->br->dev.name, p->port_no, p->dev->name,
+                              "listening");
 
-               p->state = BR_STATE_LISTENING;
+                       p->state = BR_STATE_LISTENING;
+               } else {
+                       printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
+                              p->br->dev.name, p->port_no, p->dev->name,
+                              "learning");
+
+                       p->state = BR_STATE_LEARNING;
+               }
                br_timer_set(&p->forward_delay_timer, jiffies);
        }
 }

_______________________________________________
Bridge mailing list
[EMAIL PROTECTED]
http://www.math.leidenuniv.nl/mailman/listinfo/bridge