diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 18:15:17 -0400 |
| commit | c337ffb68e1e71bad069b14d2246fa1e0c31699c (patch) | |
| tree | 7861a59b196adfd63758cc0921e4fb56030fbaf3 /net/bridge/br_stp.c | |
| parent | 30df754dedebf27ef90452944a723ba058d23396 (diff) | |
| parent | 84c0c6933cb0303fa006992a6659c2b46de4eb17 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bridge/br_stp.c')
| -rw-r--r-- | net/bridge/br_stp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index a5badd0f8226..7370d14f634d 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c | |||
| @@ -375,12 +375,12 @@ static void br_make_forwarding(struct net_bridge_port *p) | |||
| 375 | if (p->state != BR_STATE_BLOCKING) | 375 | if (p->state != BR_STATE_BLOCKING) |
| 376 | return; | 376 | return; |
| 377 | 377 | ||
| 378 | if (br->forward_delay == 0) { | 378 | if (br->stp_enabled == BR_NO_STP || br->forward_delay == 0) { |
| 379 | p->state = BR_STATE_FORWARDING; | 379 | p->state = BR_STATE_FORWARDING; |
| 380 | br_topology_change_detection(br); | 380 | br_topology_change_detection(br); |
| 381 | del_timer(&p->forward_delay_timer); | 381 | del_timer(&p->forward_delay_timer); |
| 382 | } | 382 | } |
| 383 | else if (p->br->stp_enabled == BR_KERNEL_STP) | 383 | else if (br->stp_enabled == BR_KERNEL_STP) |
| 384 | p->state = BR_STATE_LISTENING; | 384 | p->state = BR_STATE_LISTENING; |
| 385 | else | 385 | else |
| 386 | p->state = BR_STATE_LEARNING; | 386 | p->state = BR_STATE_LEARNING; |