From 493c98c6d2b52d2066a913203e4cbcee5a6080c2 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Tue, 31 Dec 2019 14:32:48 +0000
Subject: [PATCH] Add flags for upcoming patches related to improved ECN
handling. No functional change. Submitted by: Richard Scheffenegger
Reviewed by: rgrimes@, tuexen@ Differential Revision:
https://reviews.freebsd.org/D22429
---
sys/netinet/tcp.h | 3 ++-
sys/netinet/tcp_syncache.h | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 4e06c97920d6..528f3cd8dedd 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -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 */
diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h
index dd9d26a538df..27cbad42f9ae 100644
--- a/sys/netinet/tcp_syncache.h
+++ b/sys/netinet/tcp_syncache.h
@@ -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;