svn commit: r357114 - in head/sys/netinet: . tcp_stacks

[Michael Tuexen]

Author: tuexen
Date: Sat Jan 25 13:11:14 2020
New Revision: 357114
URL: https://svnweb.freebsd.org/changeset/base/357114

Log:
  As a TCP client only enable ECN when the corresponding sysctl variable
  indicates that ECN should be negotiated for the client side.
  
  Submitted by:		Richard Scheffenegger
  Reviewed by:		rgrimes@, tuexen@
  MFC after:		1 week
  Differential Revision:	https://reviews.freebsd.org/D23228

Modified:
  head/sys/netinet/tcp_input.c
  head/sys/netinet/tcp_stacks/rack.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Sat Jan 25 10:51:51 2020	(r357113)
+++ head/sys/netinet/tcp_input.c	Sat Jan 25 13:11:14 2020	(r357114)
@@ -1979,7 +1979,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
 				tp->t_flags |= TF_ACKNOW;
 
 			if (((thflags & (TH_CWR | TH_ECE)) == TH_ECE) &&
-			    V_tcp_do_ecn) {
+			    (V_tcp_do_ecn == 1)) {
 				tp->t_flags2 |= TF2_ECN_PERMIT;
 				TCPSTAT_INC(tcps_ecn_shs);
 			}

Modified: head/sys/netinet/tcp_stacks/rack.c
==============================================================================
--- head/sys/netinet/tcp_stacks/rack.c	Sat Jan 25 10:51:51 2020	(r357113)
+++ head/sys/netinet/tcp_stacks/rack.c	Sat Jan 25 13:11:14 2020	(r357114)
@@ -6296,7 +6296,7 @@ rack_do_syn_sent(struct mbuf *m, struct tcphdr *th, st
 		}
 
 		if (((thflags & (TH_CWR | TH_ECE)) == TH_ECE) &&
-		    V_tcp_do_ecn) {
+		    (V_tcp_do_ecn == 1)) {
 			tp->t_flags2 |= TF2_ECN_PERMIT;
 			TCPSTAT_INC(tcps_ecn_shs);
 		}