svn commit: r365585 - in stable/12/sys/netinet: . tcp_stacks

[Michael Tuexen]

Author: tuexen
Date: Thu Sep 10 15:58:37 2020
New Revision: 365585
URL: https://svnweb.freebsd.org/changeset/base/365585

Log:
  MFC r357115:
  
  Don't set the ECT codepoint on retransmitted packets during SACK loss
  recovery. This is required by RFC 3168.

Modified:
  stable/12/sys/netinet/tcp_output.c
  stable/12/sys/netinet/tcp_stacks/rack.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/tcp_output.c
==============================================================================
--- stable/12/sys/netinet/tcp_output.c	Thu Sep 10 15:37:29 2020	(r365584)
+++ stable/12/sys/netinet/tcp_output.c	Thu Sep 10 15:58:37 2020	(r365585)
@@ -1133,6 +1133,7 @@ send:
 		 * Ignore pure ack packets, retransmissions and window probes.
 		 */
 		if (len > 0 && SEQ_GEQ(tp->snd_nxt, tp->snd_max) &&
+		    (sack_rxmit == 0) &&
 		    !((tp->t_flags & TF_FORCEDATA) && len == 1 &&
 		    SEQ_LT(tp->snd_una, tp->snd_max))) {
 #ifdef INET6

Modified: stable/12/sys/netinet/tcp_stacks/rack.c
==============================================================================
--- stable/12/sys/netinet/tcp_stacks/rack.c	Thu Sep 10 15:37:29 2020	(r365584)
+++ stable/12/sys/netinet/tcp_stacks/rack.c	Thu Sep 10 15:58:37 2020	(r365585)
@@ -8272,6 +8272,7 @@ send:
 		 * retransmissions and window probes.
 		 */
 		if (len > 0 && SEQ_GEQ(tp->snd_nxt, tp->snd_max) &&
+		    (sack_rxmit == 0) &&
 		    !((tp->t_flags & TF_FORCEDATA) && len == 1)) {
 #ifdef INET6
 			if (isipv6)