Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[deliverable/linux.git] / net / bridge / br_stp.c

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index a5badd0f82260c630a7f53f176fc218fe1c85eaa..7370d14f634d71427d993dae89cd017067e8fcd1 100644 (file)
--- 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)
        if (p->state != BR_STATE_BLOCKING)
                return;
 
-       if (br->forward_delay == 0) {
+       if (br->stp_enabled == BR_NO_STP || br->forward_delay == 0) {
                p->state = BR_STATE_FORWARDING;
                br_topology_change_detection(br);
                del_timer(&p->forward_delay_timer);
        }
-       else if (p->br->stp_enabled == BR_KERNEL_STP)
+       else if (br->stp_enabled == BR_KERNEL_STP)
                p->state = BR_STATE_LISTENING;
        else
                p->state = BR_STATE_LEARNING;