From nobody Wed Mar 13 23:21:23 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 4Tw62r02Yfz5Df0C; Wed, 13 Mar 2024 23:21:24 +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 4Tw62q6gzPz46Gq; Wed, 13 Mar 2024 23:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710372083; 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=zIBEfQc5vPxqHZVGKKMnvFlW0xolZVCrnchZZ9XH80o=; b=wJJZk0u9q9LYOK6nvAAQdGNR+iGE4gLLuRrdBwz0pQs5r72RM+SSTZ7OJYWV9dmc458VL+ 4nXhKt+6dTOYl6Dp526f3mhkziDEWV6X2rZdf+HT752jMWUUJGvC4MNLlfaWCyfwXLGk/R 1J7I4ZmCHZfq7V9YlZbQcDFOb/kyBUCJn2YakWrRBQPab6SCsulChQBt4C7MVYThrwa2g8 xNp9yUQkdWU6jw/edRgnl6QLkMHjwLQlizqLAzFG6wJciZhvay/tRHeizelgjB2T62R7Uj BlHqNpfK4evqzEVKAj1ntarm67V3uNqU6LyyjZ/NBG6PpZJwUV2xtSbLxzYg6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710372083; a=rsa-sha256; cv=none; b=c5mCfk6SpU5qc5d2mR3cElS1KMJpuC+Fy6PddHbNVgLf30VXpsZHu7xqXp2bzc4UpNW6tX 1LhJt9YbgTJoL1ylnSUeQFjNStuEcowWAtgh6hvdB1TJ2RF/oJa91Q5GDAxGg/PquJX67P 6+rl833c/n/TOHDTmqe8z9NCa+pDl8RJBvlJrBK4jv1Grnsssg02btdGc2I0mk2NJZjsJn jSyJEsBmSrKms3ksa+AQ+zcHdTMtd5oT3Li0eKjkliPk2IxHGMWoEYrIcfPC94kfh/XguU pxiVH5kHUNipvfRYNKaGDVH8VkT1/oTHCE08hXNYK2+vIfp8w1YiLpcT+5ydYA== 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=1710372083; 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=zIBEfQc5vPxqHZVGKKMnvFlW0xolZVCrnchZZ9XH80o=; b=PDN0fvjuvLx0e3Prw7hcDNRvFTHvScvtvcrG+118UmbaWgGNoUlyxYHNkeQrANfZjI9076 /283G/jixa+FF855iqIrG2RefqR/5bnN1IaKAsBdRlKaqI1c+oPGYXfHWI+ZHRruDE5YSM ECVG264Ir7kOQe8xC/srvwoNZNEVZfuzUpc3yNzyTlQK4CJQbCpG4BbIPJ9D/+PXe4ye5f BHbmTzJEXdfWToE39U0yvnSW0hLvZBRz0RMEfL0zgrBzjlPk9WINKjZYOZZfQrkmZd+NXp q8KxNrqQP+NoyTGwXE9gGwxO6But4wbmGolTSAV8tK0bb3/gGUWy96kbWehMRQ== 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 4Tw62q6HvTz13Kk; Wed, 13 Mar 2024 23:21:23 +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 42DNLNG4087788; Wed, 13 Mar 2024 23:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42DNLNIX087785; Wed, 13 Mar 2024 23:21:23 GMT (envelope-from git) Date: Wed, 13 Mar 2024 23:21:23 GMT Message-Id: <202403132321.42DNLNIX087785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 220ee18f1964 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 220ee18f196482c534a659d1eb50db26c54ca7d0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=220ee18f196482c534a659d1eb50db26c54ca7d0 commit 220ee18f196482c534a659d1eb50db26c54ca7d0 Author: Konstantin Belousov AuthorDate: 2024-03-13 11:54:50 +0000 Commit: Konstantin Belousov 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)