summaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_subr.c
diff options
context:
space:
mode:
authorNiels Provos <provos@cvs.openbsd.org>2002-03-01 22:29:30 +0000
committerNiels Provos <provos@cvs.openbsd.org>2002-03-01 22:29:30 +0000
commit88eb9e205f021f67565cdcb0ed25974c3892e780 (patch)
tree0a9143f884ca32a8fcb4448b4137c8c3a36dc306 /sys/netinet/tcp_subr.c
parent7654fe675bb68865e2eec2bec559901d94dc31ea (diff)
remove tcp_fasttimo and convert delayed acks to the timeout(9) API instead.
adapated from netbsd. okay angelos@
Diffstat (limited to 'sys/netinet/tcp_subr.c')
-rw-r--r--sys/netinet/tcp_subr.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 2416d8bc73f..16b87a19c38 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_subr.c,v 1.57 2002/01/24 22:42:49 provos Exp $ */
+/* $OpenBSD: tcp_subr.c,v 1.58 2002/03/01 22:29:29 provos Exp $ */
/* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */
/*
@@ -183,6 +183,9 @@ tcp_init()
icmp6_mtudisc_callback_register(tcp6_mtudisc_callback);
#endif /* INET6 */
+
+ /* Initialize timer state. */
+ tcp_timer_init();
}
/*
@@ -472,6 +475,7 @@ tcp_newtcpcb(struct inpcb *inp)
tp->t_maxseg = tcp_mssdflt;
tp->t_maxopd = 0;
+ TCP_INIT_DELACK(tp);
for (i = 0; i < TCPT_NTIMERS; i++)
TCP_TIMER_INIT(tp, i);
@@ -665,6 +669,8 @@ tcp_close(struct tcpcb *tp)
/* free the reassembly queue, if any */
tcp_freeq(tp);
+ TCP_CLEAR_DELACK(tp);
+
#ifdef TCP_SACK
/* Free SACK holes. */
q = p = tp->snd_holes;