git: 1c60b2cb0ba5 - main - tcp: improve whitespace consistency for socket option names

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Tue, 10 Sep 2024 11:08:01 UTC
The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=1c60b2cb0ba59f8e700b60a343bd0397c88d7d36

commit 1c60b2cb0ba59f8e700b60a343bd0397c88d7d36
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-09-10 11:03:50 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-09-10 11:03:50 +0000

    tcp:  improve whitespace consistency for socket option names
    
    No functional change intended.
    
    Reviewed by:            rscheff
    MFC after:              1 week
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D46618
---
 sys/netinet/tcp.h | 330 +++++++++++++++++++++++++++---------------------------
 1 file changed, 165 insertions(+), 165 deletions(-)

diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index d11cca250de3..6d92f078029b 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -182,175 +182,175 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags)
  * values and are not masked together.  Some values appear to be
  * bitmasks for historical reasons.
  */
-#define	TCP_NODELAY	1	/* don't delay send to coalesce packets */
+#define	TCP_NODELAY		1	/* don't delay send to coalesce packets */
 #if __BSD_VISIBLE
-#define	TCP_MAXSEG	2	/* set maximum segment size */
-#define TCP_NOPUSH	4	/* don't push last block of write */
-#define TCP_NOOPT	8	/* don't use TCP options */
-#define TCP_MD5SIG	16	/* use MD5 digests (RFC2385) */
-#define	TCP_INFO	32	/* retrieve tcp_info structure */
-#define	TCP_STATS	33	/* retrieve stats blob structure */
-#define	TCP_LOG		34	/* configure event logging for connection */
-#define	TCP_LOGBUF	35	/* retrieve event log for connection */
-#define	TCP_LOGID	36	/* configure log ID to correlate connections */
-#define	TCP_LOGDUMP	37	/* dump connection log events to device */
-#define	TCP_LOGDUMPID	38	/* dump events from connections with same ID to
-				   device */
-#define	TCP_TXTLS_ENABLE 39	/* TLS framing and encryption for transmit */
-#define	TCP_TXTLS_MODE	40	/* Transmit TLS mode */
-#define	TCP_RXTLS_ENABLE 41	/* TLS framing and encryption for receive */
-#define	TCP_RXTLS_MODE	42	/* Receive TLS mode */
-#define	TCP_IWND_NB	43	/* Override initial window (units: bytes) */
-#define	TCP_IWND_NSEG	44	/* Override initial window (units: MSS segs) */
+#define	TCP_MAXSEG		2	/* set maximum segment size */
+#define	TCP_NOPUSH		4	/* don't push last block of write */
+#define	TCP_NOOPT		8	/* don't use TCP options */
+#define	TCP_MD5SIG		16	/* use MD5 digests (RFC2385) */
+#define	TCP_INFO		32	/* retrieve tcp_info structure */
+#define	TCP_STATS		33	/* retrieve stats blob structure */
+#define	TCP_LOG			34	/* configure event logging for connection */
+#define	TCP_LOGBUF		35	/* retrieve event log for connection */
+#define	TCP_LOGID		36	/* configure log ID to correlate connections */
+#define	TCP_LOGDUMP		37	/* dump connection log events to device */
+#define	TCP_LOGDUMPID		38	/* dump events from connections with same ID to
+					   device */
+#define	TCP_TXTLS_ENABLE	39	/* TLS framing and encryption for transmit */
+#define	TCP_TXTLS_MODE		40	/* Transmit TLS mode */
+#define	TCP_RXTLS_ENABLE	41	/* TLS framing and encryption for receive */
+#define	TCP_RXTLS_MODE		42	/* Receive TLS mode */
+#define	TCP_IWND_NB		43	/* Override initial window (units: bytes) */
+#define	TCP_IWND_NSEG		44	/* Override initial window (units: MSS segs) */
 #ifdef _KERNEL
-#define	TCP_USE_DDP	45	/* Use direct data placement for so_rcvbuf */
+#define	TCP_USE_DDP		45	/* Use direct data placement for so_rcvbuf */
 #endif
-#define	TCP_LOGID_CNT	46	/* get number of connections with the same ID */
-#define	TCP_LOG_TAG	47	/* configure tag for grouping logs */
-#define	TCP_USER_LOG	48	/* userspace log event */
-#define	TCP_CONGESTION	64	/* get/set congestion control algorithm */
-#define	TCP_CCALGOOPT	65	/* get/set cc algorithm specific options */
-#define	TCP_MAXUNACKTIME 68	/* maximum time without making progress (sec) */
-#define	TCP_MAXPEAKRATE 69	/* maximum peak rate allowed (kbps) */
-#define TCP_IDLE_REDUCE 70	/* Reduce cwnd on idle input */
-#define TCP_REMOTE_UDP_ENCAPS_PORT 71	/* Enable TCP over UDP tunneling via the specified port */
-#define TCP_DELACK  	72	/* socket option for delayed ack */
-#define TCP_FIN_IS_RST 73	/* A fin from the peer is treated has a RST */
-#define TCP_LOG_LIMIT  74	/* Limit to number of records in tcp-log */
-#define TCP_SHARED_CWND_ALLOWED 75 	/* Use of a shared cwnd is allowed */
-#define TCP_PROC_ACCOUNTING 76	/* Do accounting on tcp cpu usage and counts */
-#define TCP_USE_CMP_ACKS 77 	/* The transport can handle the Compressed mbuf acks */
-#define	TCP_PERF_INFO	78	/* retrieve accounting counters */
-#define	TCP_KEEPINIT	128	/* N, time to establish connection */
-#define	TCP_KEEPIDLE	256	/* L,N,X start keeplives after this period */
-#define	TCP_KEEPINTVL	512	/* L,N interval between keepalives */
-#define	TCP_KEEPCNT	1024	/* L,N number of keepalives before close */
-#define	TCP_FASTOPEN	1025	/* enable TFO / was created via TFO */
-#define	TCP_PCAP_OUT	2048	/* number of output packets to keep */
-#define	TCP_PCAP_IN	4096	/* number of input packets to keep */
-#define TCP_FUNCTION_BLK 8192	/* Set the tcp function pointers to the specified stack */
-#define TCP_FUNCTION_ALIAS 8193	/* Get the current tcp function pointer name alias */
+#define	TCP_LOGID_CNT		46	/* get number of connections with the same ID */
+#define	TCP_LOG_TAG		47	/* configure tag for grouping logs */
+#define	TCP_USER_LOG		48	/* userspace log event */
+#define	TCP_CONGESTION		64	/* get/set congestion control algorithm */
+#define	TCP_CCALGOOPT		65	/* get/set cc algorithm specific options */
+#define	TCP_MAXUNACKTIME	68	/* maximum time without making progress (sec) */
+#define	TCP_MAXPEAKRATE		69	/* maximum peak rate allowed (kbps) */
+#define	TCP_IDLE_REDUCE		70	/* Reduce cwnd on idle input */
+#define	TCP_REMOTE_UDP_ENCAPS_PORT 71	/* Enable TCP over UDP tunneling via the specified port */
+#define	TCP_DELACK		72	/* socket option for delayed ack */
+#define	TCP_FIN_IS_RST		73	/* A fin from the peer is treated has a RST */
+#define	TCP_LOG_LIMIT		74	/* Limit to number of records in tcp-log */
+#define	TCP_SHARED_CWND_ALLOWED	75	/* Use of a shared cwnd is allowed */
+#define	TCP_PROC_ACCOUNTING	76	/* Do accounting on tcp cpu usage and counts */
+#define	TCP_USE_CMP_ACKS	77	/* The transport can handle the Compressed mbuf acks */
+#define	TCP_PERF_INFO		78	/* retrieve accounting counters */
+#define	TCP_KEEPINIT		128	/* N, time to establish connection */
+#define	TCP_KEEPIDLE		256	/* L,N,X start keeplives after this period */
+#define	TCP_KEEPINTVL		512	/* L,N interval between keepalives */
+#define	TCP_KEEPCNT		1024	/* L,N number of keepalives before close */
+#define	TCP_FASTOPEN		1025	/* enable TFO / was created via TFO */
+#define	TCP_PCAP_OUT		2048	/* number of output packets to keep */
+#define	TCP_PCAP_IN		4096	/* number of input packets to keep */
+#define	TCP_FUNCTION_BLK	8192	/* Set the tcp function pointers to the specified stack */
+#define	TCP_FUNCTION_ALIAS	8193	/* Get the current tcp function pointer name alias */
 /* Options for Rack and BBR */
-#define	TCP_REUSPORT_LB_NUMA   1026	/* set listen socket numa domain */
-#define TCP_RACK_MBUF_QUEUE   1050 /* Do we allow mbuf queuing if supported */
-#define TCP_RACK_PROP	      1051 /* Not used */
-#define TCP_RACK_TLP_REDUCE   1052 /* RACK TLP cwnd reduction (bool) */
-#define TCP_RACK_PACE_REDUCE  1053 /* RACK Pacingv reduction factor (divisor) */
-#define TCP_RACK_PACE_MAX_SEG 1054 /* Max TSO size we will send  */
-#define TCP_RACK_PACE_ALWAYS  1055 /* Use the always pace method */
-#define TCP_RACK_PROP_RATE    1056 /* Not used */
-#define TCP_RACK_PRR_SENDALOT 1057 /* Allow PRR to send more than one seg */
-#define TCP_RACK_MIN_TO       1058 /* Minimum time between rack t-o's in ms */
-#define TCP_RACK_EARLY_RECOV  1059 /* Not used */
-#define TCP_RACK_EARLY_SEG    1060 /* If early recovery max segments */
-#define TCP_RACK_REORD_THRESH 1061 /* RACK reorder threshold (shift amount) */
-#define TCP_RACK_REORD_FADE   1062 /* Does reordering fade after ms time */
-#define TCP_RACK_TLP_THRESH   1063 /* RACK TLP theshold i.e. srtt+(srtt/N) */
-#define TCP_RACK_PKT_DELAY    1064 /* RACK added ms i.e. rack-rtt + reord + N */
-#define TCP_RACK_TLP_INC_VAR  1065 /* Does TLP include rtt variance in t-o */
-#define TCP_BBR_IWINTSO	      1067 /* Initial TSO window for BBRs first sends */
-#define TCP_BBR_RECFORCE      1068 /* Enter recovery force out a segment disregard pacer no longer valid */
-#define TCP_BBR_STARTUP_PG    1069 /* Startup pacing gain */
-#define TCP_BBR_DRAIN_PG      1070 /* Drain pacing gain */
-#define TCP_BBR_RWND_IS_APP   1071 /* Rwnd limited is considered app limited */
-#define TCP_BBR_PROBE_RTT_INT 1072 /* How long in useconds between probe-rtt */
-#define TCP_BBR_ONE_RETRAN    1073 /* Is only one segment allowed out during retran */
-#define TCP_BBR_STARTUP_LOSS_EXIT 1074	/* Do we exit a loss during startup if not 20% incr */
-#define TCP_BBR_USE_LOWGAIN   1075 /* lower the gain in PROBE_BW enable */
-#define TCP_BBR_LOWGAIN_THRESH 1076 /* Unused after 2.3 morphs to TSLIMITS >= 2.3 */
-#define TCP_BBR_TSLIMITS 1076	   /* Do we use experimental Timestamp limiting for our algo */
-#define TCP_BBR_LOWGAIN_HALF  1077 /* Unused after 2.3 */
-#define TCP_BBR_PACE_OH        1077 /* Reused in 4.2 for pacing overhead setting */
-#define TCP_BBR_LOWGAIN_FD    1078 /* Unused after 2.3 */
-#define TCP_BBR_HOLD_TARGET 1078	/* For 4.3 on */
-#define TCP_BBR_USEDEL_RATE   1079 /* Enable use of delivery rate for loss recovery */
-#define TCP_BBR_MIN_RTO       1080 /* Min RTO in milliseconds */
-#define TCP_BBR_MAX_RTO	      1081 /* Max RTO in milliseconds */
-#define TCP_BBR_REC_OVER_HPTS 1082 /* Recovery override htps settings 0/1/3 */
-#define TCP_BBR_UNLIMITED     1083 /* Not used before 2.3 and morphs to algorithm >= 2.3 */
-#define TCP_BBR_ALGORITHM     1083 /* What measurement algo does BBR use netflix=0, google=1 */
-#define TCP_BBR_DRAIN_INC_EXTRA 1084 /* Does the 3/4 drain target include the extra gain */
-#define TCP_BBR_STARTUP_EXIT_EPOCH 1085 /* what epoch gets us out of startup */
-#define TCP_BBR_PACE_PER_SEC   1086
-#define TCP_BBR_PACE_DEL_TAR   1087
-#define TCP_BBR_PACE_SEG_MAX   1088
-#define TCP_BBR_PACE_SEG_MIN   1089
-#define TCP_BBR_PACE_CROSS     1090
-#define TCP_RACK_IDLE_REDUCE_HIGH 1092  /* Reduce the highest cwnd seen to IW on idle */
-#define TCP_RACK_MIN_PACE      1093 	/* Do we enforce rack min pace time */
-#define TCP_RACK_MIN_PACE_SEG  1094	/* If so what is the seg threshould */
-#define TCP_RACK_GP_INCREASE   1094	/* After 4.1 its the GP increase in older rack */
-#define TCP_RACK_TLP_USE       1095
-#define TCP_BBR_ACK_COMP_ALG   1096 	/* Not used */
-#define TCP_BBR_TMR_PACE_OH    1096	/* Recycled in 4.2 */
-#define TCP_BBR_EXTRA_GAIN     1097
-#define TCP_RACK_DO_DETECTION  1097	/* Recycle of extra gain for rack, attack detection */
-#define TCP_BBR_RACK_RTT_USE   1098	/* what RTT should we use 0, 1, or 2? */
-#define TCP_BBR_RETRAN_WTSO    1099
-#define TCP_DATA_AFTER_CLOSE   1100
-#define TCP_BBR_PROBE_RTT_GAIN 1101
-#define TCP_BBR_PROBE_RTT_LEN  1102
-#define TCP_BBR_SEND_IWND_IN_TSO 1103	/* Do we burst out whole iwin size chunks at start? */
-#define TCP_BBR_USE_RACK_RR	 1104	/* Do we use the rack rapid recovery for pacing rxt's */
-#define TCP_BBR_USE_RACK_CHEAT TCP_BBR_USE_RACK_RR /* Compat. */
-#define TCP_BBR_HDWR_PACE      1105	/* Enable/disable hardware pacing */
-#define TCP_BBR_UTTER_MAX_TSO  1106	/* Do we enforce an utter max TSO size */
-#define TCP_BBR_EXTRA_STATE    1107	/* Special exit-persist catch up */
-#define TCP_BBR_FLOOR_MIN_TSO  1108     /* The min tso size */
-#define TCP_BBR_MIN_TOPACEOUT  1109	/* Do we suspend pacing until */
-#define TCP_BBR_TSTMP_RAISES   1110	/* Can a timestamp measurement raise the b/w */
-#define TCP_BBR_POLICER_DETECT 1111	/* Turn on/off google mode policer detection */
-#define TCP_BBR_RACK_INIT_RATE 1112	/* Set an initial pacing rate for when we have no b/w in kbits per sec */
-#define TCP_RACK_RR_CONF	1113 /* Rack rapid recovery configuration control*/
-#define TCP_RACK_CHEAT_NOT_CONF_RATE TCP_RACK_RR_CONF
-#define TCP_RACK_GP_INCREASE_CA   1114	/* GP increase for Congestion Avoidance */
-#define TCP_RACK_GP_INCREASE_SS   1115	/* GP increase for Slow Start */
-#define TCP_RACK_GP_INCREASE_REC  1116	/* GP increase for Recovery */
-#define TCP_RACK_FORCE_MSEG	1117	/* Override to use the user set max-seg value */
-#define TCP_RACK_PACE_RATE_CA  1118 /* Pacing rate for Congestion Avoidance */
-#define TCP_RACK_PACE_RATE_SS  1119 /* Pacing rate for Slow Start */
-#define TCP_RACK_PACE_RATE_REC  1120 /* Pacing rate for Recovery */
-#define TCP_NO_PRR         	1122 /* If pacing, don't use prr  */
-#define TCP_RACK_NONRXT_CFG_RATE 1123 /* In recovery does a non-rxt use the cfg rate */
-#define TCP_SHARED_CWND_ENABLE   1124 	/* Use a shared cwnd if allowed */
-#define TCP_TIMELY_DYN_ADJ       1125 /* Do we attempt dynamic multipler adjustment with timely. */
-#define TCP_RACK_NO_PUSH_AT_MAX 1126 /* For timely do not push if we are over max rtt */
-#define TCP_RACK_PACE_TO_FILL 1127 /* If we are not in recovery, always pace to fill the cwnd in 1 RTT */
-#define TCP_SHARED_CWND_TIME_LIMIT 1128 /* we should limit to low time values the scwnd life */
-#define TCP_RACK_PROFILE 1129	/* Select a profile that sets multiple options */
-#define TCP_HDWR_RATE_CAP 1130 /* Allow hardware rates to cap pacing rate */
-#define TCP_PACING_RATE_CAP 1131 /* Highest rate allowed in pacing in bytes per second (uint64_t) */
-#define TCP_HDWR_UP_ONLY 1132	/* Allow the pacing rate to climb but not descend (with the exception of fill-cw */
-#define TCP_RACK_ABC_VAL 1133	/* Set a local ABC value different then the system default */
-#define TCP_REC_ABC_VAL 1134	/* Do we use the ABC value for recovery or the override one from sysctl  */
-#define TCP_RACK_MEASURE_CNT 1135 /* How many measurements are required in GP pacing */
-#define TCP_DEFER_OPTIONS 1136 /* Defer options until the proper number of measurements occur, does not defer TCP_RACK_MEASURE_CNT */
-#define TCP_FAST_RSM_HACK 1137	/* Not used in modern stacks */
-#define TCP_RACK_PACING_BETA 1138	/* Changing the beta for pacing */
-#define TCP_RACK_PACING_BETA_ECN 1139	/* Changing the beta for ecn with pacing */
-#define TCP_RACK_TIMER_SLOP 1140	/* Set or get the timer slop used */
-#define TCP_RACK_DSACK_OPT 1141		/* How do we setup rack timer DSACK options bit 1/2 */
-#define TCP_RACK_ENABLE_HYSTART 1142	/* Do we allow hystart in the CC modules */
-#define TCP_RACK_SET_RXT_OPTIONS 1143	/* Set the bits in the retransmit options */
-#define TCP_RACK_HI_BETA 1144 /* Turn on/off high beta */
-#define TCP_RACK_SPLIT_LIMIT 1145	/* Set a split limit for split allocations */
-#define TCP_RACK_PACING_DIVISOR 1146 /* Pacing divisor given to rate-limit code for burst sizing */
-#define TCP_RACK_PACE_MIN_SEG 1147	/* Pacing min seg size rack will use */
-#define TCP_RACK_DGP_IN_REC 1148	/* Do we use full DGP in recovery? */
-/* #define TCP_POLICER_DETECT 1149 	not used */
-#define TCP_HYBRID_PACING   1150	/* Hybrid pacing enablement */
-#define TCP_PACING_DND	    1151	/* When pacing with rr_config=3 can sacks disturb us */
-#define TCP_SS_EEXIT        1152	/* Do we do early exit from slowtart if no  b/w growth */
-#define TCP_DGP_UPPER_BOUNDS 1153	/* SS and CA upper bound in percentage */
-#define TCP_NO_TIMELY	    1154	/* Disable/enable Timely */
-#define TCP_HONOR_HPTS_MIN  1155	/* Do we honor hpts min to */
-#define TCP_REC_IS_DYN      1156	/* Do we allow timely to change recovery multiplier? */
-#define TCP_SIDECHAN_DIS    1157	/* Disable/enable the side-channel */
-#define TCP_FILLCW_RATE_CAP 1158	/* Set a cap for DGP's fillcw */
-/* #define TCP_POLICER_MSS     1159	not used */
-#define TCP_STACK_SPEC_INFO 1160	/* Get stack specific information (if present) */
-#define RACK_CSPR_IS_FCC    1161
-#define TCP_GP_USE_LTBW     1162	/* how we use lt_bw 0=not, 1=min, 2=max */
+#define	TCP_REUSPORT_LB_NUMA	1026	/* set listen socket numa domain */
+#define	TCP_RACK_MBUF_QUEUE	1050	/* Do we allow mbuf queuing if supported */
+#define	TCP_RACK_PROP		1051	/* Not used */
+#define	TCP_RACK_TLP_REDUCE 	1052	/* RACK TLP cwnd reduction (bool) */
+#define	TCP_RACK_PACE_REDUCE 	1053	/* RACK Pacingv reduction factor (divisor) */
+#define	TCP_RACK_PACE_MAX_SEG	1054	/* Max TSO size we will send  */
+#define	TCP_RACK_PACE_ALWAYS	1055	/* Use the always pace method */
+#define	TCP_RACK_PROP_RATE	1056	/* Not used */
+#define	TCP_RACK_PRR_SENDALOT	1057	/* Allow PRR to send more than one seg */
+#define	TCP_RACK_MIN_TO		1058	/* Minimum time between rack t-o's in ms */
+#define	TCP_RACK_EARLY_RECOV	1059	/* Not used */
+#define	TCP_RACK_EARLY_SEG	1060	/* If early recovery max segments */
+#define	TCP_RACK_REORD_THRESH	1061	/* RACK reorder threshold (shift amount) */
+#define	TCP_RACK_REORD_FADE	1062	/* Does reordering fade after ms time */
+#define	TCP_RACK_TLP_THRESH	1063	/* RACK TLP theshold i.e. srtt+(srtt/N) */
+#define	TCP_RACK_PKT_DELAY	1064	/* RACK added ms i.e. rack-rtt + reord + N */
+#define	TCP_RACK_TLP_INC_VAR	1065	/* Does TLP include rtt variance in t-o */
+#define	TCP_BBR_IWINTSO		1067	/* Initial TSO window for BBRs first sends */
+#define	TCP_BBR_RECFORCE	1068	/* Enter recovery force out a segment disregard pacer no longer valid */
+#define	TCP_BBR_STARTUP_PG	1069	/* Startup pacing gain */
+#define	TCP_BBR_DRAIN_PG	1070	/* Drain pacing gain */
+#define	TCP_BBR_RWND_IS_APP	1071	/* Rwnd limited is considered app limited */
+#define	TCP_BBR_PROBE_RTT_INT	1072	/* How long in useconds between probe-rtt */
+#define	TCP_BBR_ONE_RETRAN	1073	/* Is only one segment allowed out during retran */
+#define	TCP_BBR_STARTUP_LOSS_EXIT 1074	/* Do we exit a loss during startup if not 20% incr */
+#define	TCP_BBR_USE_LOWGAIN	1075	/* lower the gain in PROBE_BW enable */
+#define	TCP_BBR_LOWGAIN_THRESH	1076	/* Unused after 2.3 morphs to TSLIMITS >= 2.3 */
+#define	TCP_BBR_TSLIMITS	1076	/* Do we use experimental Timestamp limiting for our algo */
+#define	TCP_BBR_LOWGAIN_HALF	1077	/* Unused after 2.3 */
+#define	TCP_BBR_PACE_OH		1077	/* Reused in 4.2 for pacing overhead setting */
+#define	TCP_BBR_LOWGAIN_FD	1078	/* Unused after 2.3 */
+#define	TCP_BBR_HOLD_TARGET	1078	/* For 4.3 on */
+#define	TCP_BBR_USEDEL_RATE	1079	/* Enable use of delivery rate for loss recovery */
+#define	TCP_BBR_MIN_RTO		1080	/* Min RTO in milliseconds */
+#define	TCP_BBR_MAX_RTO		1081	/* Max RTO in milliseconds */
+#define	TCP_BBR_REC_OVER_HPTS	1082	/* Recovery override htps settings 0/1/3 */
+#define	TCP_BBR_UNLIMITED	1083	/* Not used before 2.3 and morphs to algorithm >= 2.3 */
+#define	TCP_BBR_ALGORITHM	1083	/* What measurement algo does BBR use netflix=0, google=1 */
+#define	TCP_BBR_DRAIN_INC_EXTRA	1084	/* Does the 3/4 drain target include the extra gain */
+#define	TCP_BBR_STARTUP_EXIT_EPOCH 1085	/* what epoch gets us out of startup */
+#define	TCP_BBR_PACE_PER_SEC	1086
+#define	TCP_BBR_PACE_DEL_TAR	1087
+#define	TCP_BBR_PACE_SEG_MAX	1088
+#define	TCP_BBR_PACE_SEG_MIN	1089
+#define	TCP_BBR_PACE_CROSS	1090
+#define	TCP_RACK_IDLE_REDUCE_HIGH 1092	/* Reduce the highest cwnd seen to IW on idle */
+#define	TCP_RACK_MIN_PACE	1093	/* Do we enforce rack min pace time */
+#define	TCP_RACK_MIN_PACE_SEG	1094	/* If so what is the seg threshould */
+#define	TCP_RACK_GP_INCREASE	1094	/* After 4.1 its the GP increase in older rack */
+#define	TCP_RACK_TLP_USE	1095
+#define	TCP_BBR_ACK_COMP_ALG	1096	/* Not used */
+#define	TCP_BBR_TMR_PACE_OH	1096	/* Recycled in 4.2 */
+#define	TCP_BBR_EXTRA_GAIN	1097
+#define	TCP_RACK_DO_DETECTION	1097	/* Recycle of extra gain for rack, attack detection */
+#define	TCP_BBR_RACK_RTT_USE	1098	/* what RTT should we use 0, 1, or 2? */
+#define	TCP_BBR_RETRAN_WTSO	1099
+#define	TCP_DATA_AFTER_CLOSE	1100
+#define	TCP_BBR_PROBE_RTT_GAIN	1101
+#define	TCP_BBR_PROBE_RTT_LEN	1102
+#define	TCP_BBR_SEND_IWND_IN_TSO 1103	/* Do we burst out whole iwin size chunks at start? */
+#define	TCP_BBR_USE_RACK_RR	1104	/* Do we use the rack rapid recovery for pacing rxt's */
+#define	TCP_BBR_USE_RACK_CHEAT 	TCP_BBR_USE_RACK_RR /* Compat. */
+#define	TCP_BBR_HDWR_PACE	1105	/* Enable/disable hardware pacing */
+#define	TCP_BBR_UTTER_MAX_TSO	1106	/* Do we enforce an utter max TSO size */
+#define	TCP_BBR_EXTRA_STATE	1107	/* Special exit-persist catch up */
+#define	TCP_BBR_FLOOR_MIN_TSO	1108	/* The min tso size */
+#define	TCP_BBR_MIN_TOPACEOUT	1109	/* Do we suspend pacing until */
+#define	TCP_BBR_TSTMP_RAISES	1110	/* Can a timestamp measurement raise the b/w */
+#define	TCP_BBR_POLICER_DETECT	1111	/* Turn on/off google mode policer detection */
+#define	TCP_BBR_RACK_INIT_RATE	1112	/* Set an initial pacing rate for when we have no b/w in kbits per sec */
+#define	TCP_RACK_RR_CONF	1113	/* Rack rapid recovery configuration control*/
+#define	TCP_RACK_CHEAT_NOT_CONF_RATE TCP_RACK_RR_CONF
+#define	TCP_RACK_GP_INCREASE_CA	1114	/* GP increase for Congestion Avoidance */
+#define	TCP_RACK_GP_INCREASE_SS	1115	/* GP increase for Slow Start */
+#define	TCP_RACK_GP_INCREASE_REC 1116	/* GP increase for Recovery */
+#define	TCP_RACK_FORCE_MSEG	1117	/* Override to use the user set max-seg value */
+#define	TCP_RACK_PACE_RATE_CA	1118	/* Pacing rate for Congestion Avoidance */
+#define	TCP_RACK_PACE_RATE_SS	1119	/* Pacing rate for Slow Start */
+#define	TCP_RACK_PACE_RATE_REC	1120	/* Pacing rate for Recovery */
+#define	TCP_NO_PRR		1122	/* If pacing, don't use prr  */
+#define	TCP_RACK_NONRXT_CFG_RATE 1123	/* In recovery does a non-rxt use the cfg rate */
+#define	TCP_SHARED_CWND_ENABLE	1124	/* Use a shared cwnd if allowed */
+#define	TCP_TIMELY_DYN_ADJ	1125	/* Do we attempt dynamic multipler adjustment with timely. */
+#define	TCP_RACK_NO_PUSH_AT_MAX	1126	/* For timely do not push if we are over max rtt */
+#define	TCP_RACK_PACE_TO_FILL	1127	/* If we are not in recovery, always pace to fill the cwnd in 1 RTT */
+#define	TCP_SHARED_CWND_TIME_LIMIT 1128	/* we should limit to low time values the scwnd life */
+#define	TCP_RACK_PROFILE	1129	/* Select a profile that sets multiple options */
+#define	TCP_HDWR_RATE_CAP	1130	/* Allow hardware rates to cap pacing rate */
+#define	TCP_PACING_RATE_CAP	1131	/* Highest rate allowed in pacing in bytes per second (uint64_t) */
+#define	TCP_HDWR_UP_ONLY	1132	/* Allow the pacing rate to climb but not descend (with the exception of fill-cw */
+#define	TCP_RACK_ABC_VAL	1133	/* Set a local ABC value different then the system default */
+#define	TCP_REC_ABC_VAL		1134	/* Do we use the ABC value for recovery or the override one from sysctl  */
+#define	TCP_RACK_MEASURE_CNT	1135	/* How many measurements are required in GP pacing */
+#define	TCP_DEFER_OPTIONS	1136	/* Defer options until the proper number of measurements occur, does not defer TCP_RACK_MEASURE_CNT */
+#define	TCP_FAST_RSM_HACK	1137	/* Not used in modern stacks */
+#define	TCP_RACK_PACING_BETA	1138	/* Changing the beta for pacing */
+#define	TCP_RACK_PACING_BETA_ECN 1139	/* Changing the beta for ecn with pacing */
+#define	TCP_RACK_TIMER_SLOP	1140	/* Set or get the timer slop used */
+#define	TCP_RACK_DSACK_OPT	1141	/* How do we setup rack timer DSACK options bit 1/2 */
+#define	TCP_RACK_ENABLE_HYSTART	1142	/* Do we allow hystart in the CC modules */
+#define	TCP_RACK_SET_RXT_OPTIONS 1143	/* Set the bits in the retransmit options */
+#define	TCP_RACK_HI_BETA	1144	/* Turn on/off high beta */
+#define	TCP_RACK_SPLIT_LIMIT	1145	/* Set a split limit for split allocations */
+#define	TCP_RACK_PACING_DIVISOR	1146	/* Pacing divisor given to rate-limit code for burst sizing */
+#define	TCP_RACK_PACE_MIN_SEG	1147	/* Pacing min seg size rack will use */
+#define	TCP_RACK_DGP_IN_REC	1148	/* Do we use full DGP in recovery? */
+					/* unused; was TCP_POLICER_DETECT */
+#define	TCP_HYBRID_PACING	1150	/* Hybrid pacing enablement */
+#define	TCP_PACING_DND		1151	/* When pacing with rr_config=3 can sacks disturb us */
+#define	TCP_SS_EEXIT		1152	/* Do we do early exit from slowtart if no  b/w growth */
+#define	TCP_DGP_UPPER_BOUNDS	1153	/* SS and CA upper bound in percentage */
+#define	TCP_NO_TIMELY		1154	/* Disable/enable Timely */
+#define	TCP_HONOR_HPTS_MIN	1155	/* Do we honor hpts min to */
+#define	TCP_REC_IS_DYN		1156	/* Do we allow timely to change recovery multiplier? */
+#define	TCP_SIDECHAN_DIS	1157	/* Disable/enable the side-channel */
+#define	TCP_FILLCW_RATE_CAP	1158	/* Set a cap for DGP's fillcw */
+					/* unused; was TCP_POLICER_MSS */
+#define	TCP_STACK_SPEC_INFO	1160	/* Get stack specific information (if present) */
+#define	RACK_CSPR_IS_FCC	1161
+#define	TCP_GP_USE_LTBW		1162	/* how we use lt_bw 0=not, 1=min, 2=max */
 
 
 /* Start of reserved space for third-party user-settable options. */