summaryrefslogtreecommitdiff
path: root/net/bridge/br_stp_if.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-03-04 04:15:34 +0300
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-05 08:06:21 +0300
commitd32439c0d4cec5c4101477989ee8c7ee1ebfbb0e (patch)
treec28284854f8f1aa74f60ed8378c0984fbcae747e /net/bridge/br_stp_if.c
parent6e86b89084a60355f0e1fb876ca0cfbca62ee85c (diff)
downloadlinux-d32439c0d4cec5c4101477989ee8c7ee1ebfbb0e.tar.xz
[BRIDGE]: port timer initialization
Initialize the STP timers for a port when it is created, rather than when it is enabled. This will prevent future race conditions where timer gets started before port is enabled. Signed-off-by: Stephen Hemminger <shemmigner@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_stp_if.c')
-rw-r--r--net/bridge/br_stp_if.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 35cf3a074087..23dea1422c9a 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -39,8 +39,6 @@ void br_init_port(struct net_bridge_port *p)
p->state = BR_STATE_BLOCKING;
p->topology_change_ack = 0;
p->config_pending = 0;
-
- br_stp_port_timer_init(p);
}
/* called under bridge lock */