svn commit: r362869 - stable/12/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Wed Jul  1 21:40:27 2020
New Revision: 362869
URL: https://svnweb.freebsd.org/changeset/base/362869

Log:
  MFC r356226:
  Clear the flag indicating that the last received packet was marked CE also
  in the case where a packet not marked was received.
  
  Submitted by:		rscheff
  Reviewed by:		rgrimes, tuexen
  Differential Revision:	https://reviews.freebsd.org/D19143

Modified:
  stable/12/sys/netinet/tcp_input.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/tcp_input.c
==============================================================================
--- stable/12/sys/netinet/tcp_input.c	Wed Jul  1 21:37:32 2020	(r362868)
+++ stable/12/sys/netinet/tcp_input.c	Wed Jul  1 21:40:27 2020	(r362869)
@@ -500,14 +500,15 @@ cc_ecnpkt_handler(struct tcpcb *tp, struct tcphdr *th,
 	if (CC_ALGO(tp)->ecnpkt_handler != NULL) {
 		switch (iptos & IPTOS_ECN_MASK) {
 		case IPTOS_ECN_CE:
-		    tp->ccv->flags |= CCF_IPHDR_CE;
-		    break;
+			tp->ccv->flags |= CCF_IPHDR_CE;
+			break;
 		case IPTOS_ECN_ECT0:
-		    tp->ccv->flags &= ~CCF_IPHDR_CE;
-		    break;
+			/* FALLTHROUGH */
 		case IPTOS_ECN_ECT1:
-		    tp->ccv->flags &= ~CCF_IPHDR_CE;
-		    break;
+			/* FALLTHROUGH */
+		case IPTOS_ECN_NOTECT:
+			tp->ccv->flags &= ~CCF_IPHDR_CE;
+			break;
 		}
 
 		if (th->th_flags & TH_CWR)