git: f7425802933f - stable/14 - tcp: fix t_flags2 collision

From: Michael Tuexen <tuexen_at_FreeBSD.org>
Date: Sat, 10 Aug 2024 10:28:42 UTC
The branch stable/14 has been updated by tuexen:

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

commit f7425802933f76c9af62c09a79a87753626281e0
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-08-03 19:49:18 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-08-10 10:27:53 +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")
    Sponsored by:           Netflix, Inc.
    
    (cherry picked from commit 52eacec95d54205962a3d6902e18e41fce8b4e79)
---
 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 9ba13b779616..83ea1608abe1 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -864,7 +864,7 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack)
 #define	TF2_MBUF_QUEUE_READY	0x00020000 /* Inputs can be queued */
 #define	TF2_DONT_SACK_QUEUE	0x00040000 /* Don't wake on sack */
 #define	TF2_CANNOT_DO_ECN	0x00080000 /* The stack does not do ECN */
-#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