svn commit: r293313 - head/sys/netinet/tcp_stacks

Jonathan T. Looney jtl at FreeBSD.org
Thu Jan 7 11:54:21 UTC 2016


Author: jtl
Date: Thu Jan  7 11:54:20 2016
New Revision: 293313
URL: https://svnweb.freebsd.org/changeset/base/293313

Log:
  Apply the changes from r293284 to one additional file.
  
  Discussed with:	glebius

Modified:
  head/sys/netinet/tcp_stacks/fastpath.c

Modified: head/sys/netinet/tcp_stacks/fastpath.c
==============================================================================
--- head/sys/netinet/tcp_stacks/fastpath.c	Thu Jan  7 10:39:13 2016	(r293312)
+++ head/sys/netinet/tcp_stacks/fastpath.c	Thu Jan  7 11:54:20 2016	(r293313)
@@ -158,13 +158,11 @@ static void	 tcp_do_segment_fastack(stru
  *	  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)))
 
 /*


More information about the svn-src-head mailing list