git: 220ee18f1964 - main - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env

From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Wed, 13 Mar 2024 23:21:23 UTC
The branch main has been updated by kib:

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

commit 220ee18f196482c534a659d1eb50db26c54ca7d0
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-03-13 11:54:50 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-03-13 23:20:58 +0000

    netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env
    
    and drop the definition for userspace (which matched TCP_RFC7413) since
    it depends on presence of the kernel option.
    
    Reviewed by:    glebius, rscheff
    Sponsored by:   NVIDIA networking
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D44349
---
 sys/netinet/tcp_var.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 6f7f7115c2f4..7b5c57d39213 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -812,11 +812,13 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack)
 #define	ENTER_RECOVERY(t_flags) t_flags |= (TF_CONGRECOVERY | TF_FASTRECOVERY)
 #define	EXIT_RECOVERY(t_flags) t_flags &= ~(TF_CONGRECOVERY | TF_FASTRECOVERY)
 
-#if defined(_KERNEL) && !defined(TCP_RFC7413)
+#if defined(_KERNEL)
+#if !defined(TCP_RFC7413)
 #define	IS_FASTOPEN(t_flags)		(false)
 #else
 #define	IS_FASTOPEN(t_flags)		(t_flags & TF_FASTOPEN)
 #endif
+#endif
 
 #define	BYTES_THIS_ACK(tp, th)	(th->th_ack - tp->snd_una)