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_subr.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_subr.c')
-rw-r--r-- | sys/netinet/tcp_subr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 39acf62..85d5a9e 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1736,7 +1736,7 @@ tcp_twstart(struct tcpcb *tp) { struct tcptw *tw; struct inpcb *inp; - int tw_time, acknow; + int acknow; struct socket *so; INP_INFO_WLOCK_ASSERT(&tcbinfo); /* tcp_timer_2msl_reset(). */ @@ -1781,7 +1781,6 @@ tcp_twstart(struct tcpcb *tp) * be used for fin-wait-2 state also, then we may need * a ts_recent from the last segment. */ - tw_time = 2 * tcp_msl; acknow = tp->t_flags & TF_ACKNOW; /* @@ -1803,7 +1802,7 @@ tcp_twstart(struct tcpcb *tp) tcp_twrespond(tw, TH_ACK); inp->inp_ppcb = tw; inp->inp_vflag |= INP_TIMEWAIT; - tcp_timer_2msl_reset(tw, tw_time, 0); + tcp_timer_2msl_reset(tw, 0); /* * If the inpcb owns the sole reference to the socket, then we can |