[BRIDGE]: Skip the LISTENING_STP state if STP is disabled.

c6a4620a · Lennert Buytenhek · David S. Miller · 25587b00 · c6a4620a
Commit c6a4620a authored Oct 04, 2002 by Lennert Buytenhek Committed by David S. Miller Oct 04, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

net/bridge/br_stp.c net/bridge/br_stp.c +13 -4

No files found.
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -369,10 +369,19 @@ static void br_make_blocking(struct net_bridge_port *p)
 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",
+		if (p->br->stp_enabled) {
-		       p->br->dev.name, p->port_no, p->dev->name, "listening");
+			printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
+			       p->br->dev.name, p->port_no, p->dev->name,
-		p->state = BR_STATE_LISTENING;
+			       "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);
 	}
 }