From nobody Wed Mar 20 00:53:51 2024 X-Original-To: dev-commits-src-all@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 4Tzqpl2V7gz5Fw2D; Wed, 20 Mar 2024 00:53:51 +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 4Tzqpl1yjRz4VNg; Wed, 20 Mar 2024 00:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896031; 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=uQnzs623cxozRNtpygC0TKafRdyutxFlWvRDah9Bk64=; b=MEksaQqFvzbhEc0gBkbT5Rb8gqGxlysQBFdcUglvzLcnqK02qVoP5HUyEMwZ6TvpOJavXX mYyOpa/a6tfW6rgy2HZAGPoNurfYdeinZhqIZaNDGKKSF7OAVmkFKdZNPOfGhuJlU6vxuq OO6bUgRLS+GfGlzomh3+/w/pM27m+n7lI8b9J8D7PGQPh9AJpXgD+sIUK3lY2tgc9FDCMM hnkoLugyTrz3DDNqgMA8FwzeyPa0EWFzhd7tM4QLLr3B50JNtOI/gqeGyepkzRq4rf2ZER U+CoEJYWop5DfO7GHD2FgLqG5SkukLWxKpy+mPfmrFXWQ/7CayyTC7zTyTnGXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710896031; a=rsa-sha256; cv=none; b=c7yPOMxhlTC5h9fVlxOblVgbtjgt5ou0iuoTGnWuTk2DkTjr22APzJ+zfqT1qsB9Rv8abJ Un/dODDgk4vn+EmsX3XNmiKZ7PMHNH9rxRvkbLD1zEhAEXrkjS3DhHy/OK6eYVkpBMzYg7 fU3QDwrRcNS0xF1YkQ2laffUOhDCqjO6NUWIncKuVaAxvDd/Tn+i9dTIamhWSzOIHaG7CW LkXbaPqvRhV62cgmjKGr+ZIlOulDCLlihwESutH37zpVvGcs9UIHmy2tizOMIY6twn5450 ww0pPcWndwFdkT4Yz0DKTgSg4OI5a61bntqBvnCLkhyRjw3T06Mmn4YE9BV49Q== 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=1710896031; 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=uQnzs623cxozRNtpygC0TKafRdyutxFlWvRDah9Bk64=; b=BoSFkjuw+bwow2Od3dFv+sf0VhLHG4GcvomxGU4WL78ABzO8tCd+WVxPYSkw4lv4Q95H6f Em0WbhafvsxGTrHyMn6B0iU9Yl+F/HM7osizC214nTntVh9SpsvV6Khg4EnE7HCBmEZ9Di PTIAC0wr2oOZagGWALbJIfmYRVm0HVISbwwfKsXA20Gu7gjveQqUW2RKiUvehePF8+HGNz oHbucOlXaFZaGIJvcVnFQJnsNMfjjsd1J1wQPJdiupej4Rs4wEhspf38kouCm/rnC/PiDq XYpMU7DhNbLATKC6a9tTNBbPNUxPIb6IYYZMAaCv95wt/ygV6I/KGH9Ce9at6w== 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 4Tzqpl1YgQzVyQ; Wed, 20 Mar 2024 00:53:51 +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 42K0rpJ1047964; Wed, 20 Mar 2024 00:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K0rpYd047961; Wed, 20 Mar 2024 00:53:51 GMT (envelope-from git) Date: Wed, 20 Mar 2024 00:53:51 GMT Message-Id: <202403200053.42K0rpYd047961@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: 87c7f74ff4da - stable/14 - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 87c7f74ff4dac9b3bb4138216292e68871acb0c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87c7f74ff4dac9b3bb4138216292e68871acb0c5 commit 87c7f74ff4dac9b3bb4138216292e68871acb0c5 Author: Konstantin Belousov AuthorDate: 2024-03-13 11:54:50 +0000 Commit: Konstantin Belousov 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)