git: 6b802933f16f - main - tcp: rearrange enum and remove unused variable

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=6b802933f16f7dba62800ef29912f378e048f2ce

commit 6b802933f16f7dba62800ef29912f378e048f2ce
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2023-02-21 17:26:49 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-02-21 17:26:49 +0000

    tcp: rearrange enum and remove unused variable
    
    Rearrange the enum tt_which such that TT_REXMIT is 0. This allows
    an extension of the BBLog event RTO in a backwards compatible way.
    Remove tcptimers, which was only used in trpt, a utility removed
    from the source tree recently.
    
    Reviewed by:            glebius@, guest-ccui@
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D38547
---
 sys/netinet/tcp_timer.h | 5 -----
 sys/netinet/tcp_var.h   | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 9d27c9e3780e..9ee1d5fcdc91 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -127,11 +127,6 @@
  */
 #define TCP_RTT_INVALIDATE (TCP_MAXRXTSHIFT / 4)
 
-#ifdef	TCPTIMERS
-static const char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL", "DELACK" };
-#endif
-
 /*
  * Force a time value to be in a certain range.
  */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index c2d5c2c99587..cd457893e36f 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -127,11 +127,11 @@ struct sackhint {
 STAILQ_HEAD(tcp_log_stailq, tcp_log_mem);
 
 typedef enum {
-	TT_DELACK = 0,
-	TT_REXMT,
+	TT_REXMT = 0,
 	TT_PERSIST,
 	TT_KEEP,
 	TT_2MSL,
+	TT_DELACK,
 	TT_N,
 } tt_which;