diff options
| author |   bluhm <bluhm@openbsd.org> | 2018-05-08 15:10:33 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2018-05-08 15:10:33 +0000 |
| commit | 5bcca80f6ba5818c8657351412841c1d1c8fb854 (patch) | |
| tree | 6e9ff4c0a738c2c2681b57994eb0abf3624ae302 /sys/netinet/tcp_input.c | |
| parent | Socket splicing can delay operations by task or timeout. Introduce (diff) | |
| download | wireguard-openbsd-5bcca80f6ba5818c8657351412841c1d1c8fb854.tar.xz wireguard-openbsd-5bcca80f6ba5818c8657351412841c1d1c8fb854.zip | |
Historically there were slow and fast tcp timeouts. That is why
the delack timer had a different implementation. Use the same
mechanism for all TCP timer.
OK mpi@ visa@
Diffstat (limited to 'sys/netinet/tcp_input.c')
| -rw-r--r-- | sys/netinet/tcp_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index d52fd579650..a5fd6f7d7e4 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.354 2017/12/04 13:40:34 bluhm Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.355 2018/05/08 15:10:33 bluhm Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -176,12 +176,12 @@ do { \ struct ifnet *ifp = NULL; \ if (m && (m->m_flags & M_PKTHDR)) \ ifp = if_get(m->m_pkthdr.ph_ifidx); \ - if ((tp)->t_flags & TF_DELACK || \ + if (TCP_TIMER_ISARMED(tp, TCPT_DELACK) || \ (tcp_ack_on_push && (tiflags) & TH_PUSH) || \ (ifp && (ifp->if_flags & IFF_LOOPBACK))) \ tp->t_flags |= TF_ACKNOW; \ else \ - TCP_SET_DELACK(tp); \ + TCP_TIMER_ARM_MSEC(tp, TCPT_DELACK, tcp_delack_msecs); \ if_put(ifp); \ } while (0) |