diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /net/ipv4 | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 1f52d293d..de4722707 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -241,7 +241,6 @@ static void tcp_delack_timer(unsigned long data) TCP_CHECK_TIMER(sk); out_unlock: - timer_exit(&tp->delack_timer); bh_unlock_sock(sk); sock_put(sk); } @@ -299,7 +298,6 @@ static void tcp_probe_timer(unsigned long data) TCP_CHECK_TIMER(sk); } out_unlock: - timer_exit(&tp->probe_timer); bh_unlock_sock(sk); sock_put(sk); } @@ -611,7 +609,6 @@ static void tcp_retransmit_timer(unsigned long data) TCP_CHECK_TIMER(sk); out_unlock: - timer_exit(&tp->retransmit_timer); bh_unlock_sock(sk); sock_put(sk); } @@ -806,7 +803,6 @@ death: tcp_done(sk); out: - timer_exit(&sk->timer); bh_unlock_sock(sk); sock_put(sk); } |