diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /net/ipv4/timer.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'net/ipv4/timer.c')
| -rw-r--r-- | net/ipv4/timer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/timer.c b/net/ipv4/timer.c index d5f6d3eb5..df3c9cce5 100644 --- a/net/ipv4/timer.c +++ b/net/ipv4/timer.c @@ -5,7 +5,7 @@ * * TIMER - implementation of software timers for IP. * - * Version: $Id: timer.c,v 1.11 1998/03/19 08:34:06 davem Exp $ + * Version: $Id: timer.c,v 1.14 1998/11/07 11:55:43 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -74,7 +74,8 @@ void net_timer (unsigned long data) /* Only process if socket is not in use. */ if (atomic_read(&sk->sock_readers)) { - sk->timer.expires = jiffies+HZ; + /* Try again later. */ + sk->timer.expires = jiffies+HZ/20; add_timer(&sk->timer); return; } @@ -111,11 +112,10 @@ void net_timer (unsigned long data) case TIME_CLOSE: /* We've waited long enough, close the socket. */ - sk->state = TCP_CLOSE; - net_delete_timer (sk); + tcp_set_state(sk, TCP_CLOSE); + sk->shutdown = SHUTDOWN_MASK; if (!sk->dead) sk->state_change(sk); - sk->shutdown = SHUTDOWN_MASK; net_reset_timer (sk, TIME_DONE, TCP_DONE_TIME); break; |