git: 52eacec95d54 - main - tcp: fix t_flags2 collision

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Sat, 03 Aug 2024 19:55:06 UTC
The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=52eacec95d54205962a3d6902e18e41fce8b4e79

commit 52eacec95d54205962a3d6902e18e41fce8b4e79
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-08-03 19:49:18 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-08-03 19:49:18 +0000

    tcp: fix t_flags2 collision
    
    Fix the collision of TF2_IPSEC_TSO and TF2_NO_ISS_CHECK
    
    Fixes:                  646c28ea80cb ("tcp: improve SEG.ACK validation")
    MFC after:              1 week
    Sponsored by:           Netflix, Inc.
---
 sys/netinet/tcp_var.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index cc982e321709..8ff015b90f89 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -854,7 +854,7 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack)
 #define	TF2_CANNOT_DO_ECN	0x00080000 /* The stack does not do ECN */
 #define	TF2_PROC_SACK_PROHIBIT	0x00100000 /* Due to small MSS size do not process sack's */
 #define	TF2_IPSEC_TSO		0x00200000 /* IPSEC + TSO supported */
-#define	TF2_NO_ISS_CHECK	0x00200000 /* Don't check SEG.ACK against ISS */
+#define	TF2_NO_ISS_CHECK	0x00400000 /* Don't check SEG.ACK against ISS */
 
 /*
  * Structure to hold TCP options that are only used during segment