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

[Michael Tuexen]

Author: tuexen
Date: Wed Jul  1 21:42:52 2020
New Revision: 362870
URL: https://svnweb.freebsd.org/changeset/base/362870

Log:
  MFC r356227:
  Add flags for upcoming patches related to improved ECN handling.
  No functional change.
  
  Submitted by:		rscheff
  Reviewed by:		rgrimes, tuexen
  Differential Revision:	https://reviews.freebsd.org/D22429

Modified:
  stable/12/sys/netinet/tcp.h
  stable/12/sys/netinet/tcp_syncache.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/tcp.h
==============================================================================
--- stable/12/sys/netinet/tcp.h	Wed Jul  1 21:40:27 2020	(r362869)
+++ stable/12/sys/netinet/tcp.h	Wed Jul  1 21:42:52 2020	(r362870)
@@ -71,8 +71,9 @@ struct tcphdr {
 #define	TH_URG	0x20
 #define	TH_ECE	0x40
 #define	TH_CWR	0x80
+#define	TH_AE	0x100			/* maps into th_x2 */
 #define	TH_FLAGS	(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|TH_ECE|TH_CWR)
-#define	PRINT_TH_FLAGS	"\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE\10CWR"
+#define	PRINT_TH_FLAGS	"\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE\10CWR\11AE"
 
 	u_short	th_win;			/* window */
 	u_short	th_sum;			/* checksum */

Modified: stable/12/sys/netinet/tcp_syncache.h
==============================================================================
--- stable/12/sys/netinet/tcp_syncache.h	Wed Jul  1 21:40:27 2020	(r362869)
+++ stable/12/sys/netinet/tcp_syncache.h	Wed Jul  1 21:42:52 2020	(r362870)
@@ -90,6 +90,10 @@ struct syncache {
 #define SCF_SIGNATURE	0x20			/* send MD5 digests */
 #define SCF_SACK	0x80			/* send SACK option */
 #define SCF_ECN		0x100			/* send ECN setup packet */
+#define SCF_ACE_N	0x200			/* send ACE non-ECT setup */
+#define SCF_ACE_0	0x400			/* send ACE ECT0 setup */
+#define SCF_ACE_1	0x800			/* send ACE ECT1 setup */
+#define SCF_ACE_CE	0x1000			/* send ACE CE setup */
 
 struct syncache_head {
 	struct mtx	sch_mtx;