diff options
| author | ru <ru@FreeBSD.org> | 2006-09-07 13:06:00 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-09-07 13:06:00 +0000 |
| commit | 0d416557b83f1cab7866408d2a3356d74f9e2f3c (patch) | |
| tree | e02398a49c460cafd22200e8f849a887f6e31762 /sys/netinet/tcp_input.c | |
| parent | c9b5882a6eb5b95543c8cc67df0fa602a275d2e5 (diff) | |
| download | FreeBSD-src-0d416557b83f1cab7866408d2a3356d74f9e2f3c.zip FreeBSD-src-0d416557b83f1cab7866408d2a3356d74f9e2f3c.tar.gz | |
Back when we had T/TCP support, we used to apply different
timeouts for TCP and T/TCP connections in the TIME_WAIT
state, and we had two separate timed wait queues for them.
Now that is has gone, the timeout is always 2*MSL again,
and there is no reason to keep two queues (the first was
unused anyway!).
Also, reimplement the remaining queue using a TAILQ (it
was technically impossible before, with two queues).
Diffstat (limited to 'sys/netinet/tcp_input.c')
| -rw-r--r-- | sys/netinet/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 0699193..18b20e7 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -3187,7 +3187,7 @@ tcp_timewait(inp, to, th, m, tlen) const int isipv6 = 0; #endif - /* tcbinfo lock required for tcp_twclose(), tcp_2msl_reset. */ + /* tcbinfo lock required for tcp_twclose(), tcp_timer_2msl_reset(). */ INP_INFO_WLOCK_ASSERT(&tcbinfo); INP_LOCK_ASSERT(inp); @@ -3256,7 +3256,7 @@ tcp_timewait(inp, to, th, m, tlen) if (thflags & TH_FIN) { seq = th->th_seq + tlen + (thflags & TH_SYN ? 1 : 0); if (seq + 1 == tw->rcv_nxt) - tcp_timer_2msl_reset(tw, 2 * tcp_msl, 1); + tcp_timer_2msl_reset(tw, 1); } /* |
