diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /net/bridge/br_stp_if.c | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'net/bridge/br_stp_if.c')
| -rw-r--r-- | net/bridge/br_stp_if.c | 2 |
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) | |||
| 39 | p->state = BR_STATE_BLOCKING; | 39 | p->state = BR_STATE_BLOCKING; |
| 40 | p->topology_change_ack = 0; | 40 | p->topology_change_ack = 0; |
| 41 | p->config_pending = 0; | 41 | p->config_pending = 0; |
| 42 | |||
| 43 | br_stp_port_timer_init(p); | ||
| 44 | } | 42 | } |
| 45 | 43 | ||
| 46 | /* called under bridge lock */ | 44 | /* called under bridge lock */ |