svn commit: r356226 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Tue Dec 31 14:23:52 2019
New Revision: 356226
URL: https://svnweb.freebsd.org/changeset/base/356226

Log:
  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:		Richard Scheffenegger
  Reviewed by:		rgrimes@, tuexen@
  MFC after:		1 week
  Differential Revision:	https://reviews.freebsd.org/D19143

Modified:
  head/sys/netinet/tcp_input.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Tue Dec 31 13:56:48 2019	(r356225)
+++ head/sys/netinet/tcp_input.c	Tue Dec 31 14:23:52 2019	(r356226)
@@ -522,14 +522,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)