Commit c6a4620a authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by David S. Miller

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

parent 25587b00
...@@ -369,10 +369,19 @@ static void br_make_blocking(struct net_bridge_port *p) ...@@ -369,10 +369,19 @@ static void br_make_blocking(struct net_bridge_port *p)
static void br_make_forwarding(struct net_bridge_port *p) static void br_make_forwarding(struct net_bridge_port *p)
{ {
if (p->state == BR_STATE_BLOCKING) { 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); br_timer_set(&p->forward_delay_timer, jiffies);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment