diff options
author | jtl <jtl@FreeBSD.org> | 2016-01-07 11:54:20 +0000 |
---|---|---|
committer | jtl <jtl@FreeBSD.org> | 2016-01-07 11:54:20 +0000 |
commit | a6b350eb35860ba09c4840a8ca581c6eb1996ee5 (patch) | |
tree | 3132b3672bd30668803a20d5b07e71e74dba7a83 | |
parent | cc39d2e41ac089ff2f629f360e16724dced3e2fb (diff) | |
download | FreeBSD-src-a6b350eb35860ba09c4840a8ca581c6eb1996ee5.zip FreeBSD-src-a6b350eb35860ba09c4840a8ca581c6eb1996ee5.tar.gz |
Apply the changes from r293284 to one additional file.
Discussed with: glebius
-rw-r--r-- | sys/netinet/tcp_stacks/fastpath.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet/tcp_stacks/fastpath.c b/sys/netinet/tcp_stacks/fastpath.c index 85b24f6..a49f85b 100644 --- a/sys/netinet/tcp_stacks/fastpath.c +++ b/sys/netinet/tcp_stacks/fastpath.c @@ -158,13 +158,11 @@ static void tcp_do_segment_fastack(struct mbuf *, struct tcphdr *, * the ack that opens up a 0-sized window. * - LRO wasn't used for this segment. We make sure by checking that the * segment size is not larger than the MSS. - * - Delayed acks are enabled or this is a half-synchronized T/TCP - * connection. */ #define DELAY_ACK(tp, tlen) \ ((!tcp_timer_active(tp, TT_DELACK) && \ (tp->t_flags & TF_RXWIN0SENT) == 0) && \ - (tlen <= tp->t_maxopd) && \ + (tlen <= tp->t_maxseg) && \ (V_tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN))) /* |