Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Mar 2024 00:53:51 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 87c7f74ff4da - stable/14 - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env
Message-ID:  <202403200053.42K0rpYd047961@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by kib:

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

commit 87c7f74ff4dac9b3bb4138216292e68871acb0c5
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-03-13 11:54:50 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-03-20 00:53:28 +0000

    netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env
    
    (cherry picked from commit 220ee18f196482c534a659d1eb50db26c54ca7d0)
---
 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 4be7fc1baad5..8e2a17204ae3 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -816,11 +816,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)
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403200053.42K0rpYd047961>