diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-07 21:47:30 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-07 21:47:30 +0000 |
| commit | f6e77c94796edad172602234826a022d463d910e (patch) | |
| tree | f5cb0848c9e848499b0f0676fafe7ff207538ae8 /net/bridge/br_stp_if.c | |
| parent | beb84dc8186662b17d5ea510fabb85cb7e266d33 (diff) | |
| parent | d0b004840bd3b5ff2f2a0ad14fa0bd43349f5175 (diff) | |
| download | op-kernel-dev-f6e77c94796edad172602234826a022d463d910e.zip op-kernel-dev-f6e77c94796edad172602234826a022d463d910e.tar.gz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 35cf3a0..23dea14 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 */ |
