From nobody Wed Mar 20 00:54:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TzqqG4S34z5FwGV; Wed, 20 Mar 2024 00:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TzqqG3Yf6z4W3J; Wed, 20 Mar 2024 00:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2I8AF/wTJBv8JcPNXI5KZgvHHwgirN9fhjRxPqdi1PU=; b=wMIfgzyPsx5d+6+6y7kGpLunKPpgCeSKcIkj8RONtAZDDClwan8A+c/GwJjzVw31nfVUWh L83W9GPCLN/3D3prwans8i6OHxtAtbj0NEFSgCtlD07VyNnERekgMDC0MA5+9ZuNlUug1V isMxCG8Wtn4t6WkERIJAnUtkJO6qewaKrmd+0mxvZ0ALpL00A4B8EAPh4WzLYLS0mrSyoq UI/2VrUL7Tl9bFNRsExAwjTs3TosXWlvr1AjKd4IAkXwJ77mZqCifefUIes+f3KmYw8E8z OJe2g2hS81wjdLhBDQOYTB6X3H9vbBYmxYnczwelxDarCWnZFp4esaDonE9D5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710896058; a=rsa-sha256; cv=none; b=g43vI9X7ahcsIsI34C3lYSMoo8r/mo3Tfz6IHleLZSqR21wN7wgTqhykrZ2EYjru5rEzy4 Z5XsaIV+27DN0pD3qLbWnolO7vPUqf9Cs3sU+EAkq8fLYCIL0/iZzDiN2LZvUkguMACsIR fXEwRNaGC1RVo8FiswQ9eKsBs74r6+S/kan5wW5ZgjXzRzGjRFquRSBmdKewERLBK9Y7pG QQvcOsdZOnmBFD9rL+P7YeM+5nafH8qOCyG39sgQZ5YxkoBeHo5J/KmBgjQ0LP2g+cZrSl QDScIR/x7BEaGAPbW2cmypDEnhb4KDgQOvJPXrz0Reut5YZ93ErXmAnpgudfWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2I8AF/wTJBv8JcPNXI5KZgvHHwgirN9fhjRxPqdi1PU=; b=CgVK3ThIYFO9ME8Nl3+8G0glutI0NsNAu5X0vpb62Sc8DAkJL5MGIl4FqFpP0dyIAywy/x dg+yJ5+hGR3i+unvJ+JiuHO5BxccboCMakWAXniKFn6vSQmTHzW6H/w0RQ34jr49yMzEET Wa1OOxisMveN45a5T6FnquxIfbcPapSJlZYkNPKpitIvE8UHypSwQxXfgtgit5emOCYzA/ Rc6UZpXAEwpbhBk35sR0DNIV9DuAMq1qDRl+X1KPuOs/3mE4qXB7b+urWHDhmow2jaleRr KuSM8HMlaUszRCBtZi5+0FeYt66x6s/FAZC/V9Q+RWomzlPrsOZ0Y7KyjR2oVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TzqqG393TzWJ9; Wed, 20 Mar 2024 00:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42K0sICe048173; Wed, 20 Mar 2024 00:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K0sIpC048170; Wed, 20 Mar 2024 00:54:18 GMT (envelope-from git) Date: Wed, 20 Mar 2024 00:54:18 GMT Message-Id: <202403200054.42K0sIpC048170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6fd2c94c8a04 - stable/13 - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6fd2c94c8a04814fb9258c1a6181923e141ac9ca Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6fd2c94c8a04814fb9258c1a6181923e141ac9ca commit 6fd2c94c8a04814fb9258c1a6181923e141ac9ca Author: Konstantin Belousov AuthorDate: 2024-03-13 11:54:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 00:53:59 +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 c3d28f1ad6e1..6815c6533073 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -431,11 +431,13 @@ TAILQ_HEAD(tcp_funchead, tcp_function); #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)