From nobody Thu Jun 26 16:09:50 2025 X-Original-To: dev-commits-src-main@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 4bSkCz0pQtz60jrM; Thu, 26 Jun 2025 16:09: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSkCy6hNsz3cg9; Thu, 26 Jun 2025 16:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750954191; 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=34DdXchw+2lpBn1Oj5N2hmPrtz+w0L7DQoh4PpApO9Q=; b=fUxl3Ahx5ucb3gOtQrM8tCgQUsjiv/u2ynNR7TCY50I/b0zNNRMPMlmm3HraQksPZkkkQG FSk7Tqx1qLMLs3BF/CEfH7LDeNYpOEJGg0sSYgQv+aBHF3V7+VbNzssWlUtKMz/L0+YArV sNwi5uyFCD0OTS1JHcyloTVjaYldP/w7S9phRack3DrVz2EJ/51+qfaENl3zzxr8F+bxNW FSIJvnOuGA26MCy1qqRlRmbaIkvClbVrRr8Lrhte0bTX4QMVehMUCGRcmHaf2sBDFnZoir 9S0FX1ZV3UpzIP/Cpiz2Il7EfZL4csFx2gdMa381pzKgXb59nzyMYqj+aCDEEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750954191; 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=34DdXchw+2lpBn1Oj5N2hmPrtz+w0L7DQoh4PpApO9Q=; b=Qq8opvdUFhcAahYPLttzRjl1jSJY4hWjFox5g2lfu0p2bLEcTBBrG4CbKZyoRtBZqylJJQ 54jlTWocm5sqFwLtYo2rxUoKz/XHbj8suPHk/1bBh0xsyJggjlOAlBjxH5QQd4BeFniFhT TT02YdukIxo8OI723azCtnhBWwk9DNLkxDx4udctnijfXXGqfvwm5OpDdXEa4LhFZWtcvR Bvz/ejo7XhCllSBf+YlBid5G7b6v6A8qKilYZe3dhMQMumpv1YqLP4n+RIZqNZl9gb/l+U lyx6aG50zVwsxvmmtJiDsfWeiZ+eWiAEpr0CMheKVMDQtR5GEowHAO9XLrxjNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750954191; a=rsa-sha256; cv=none; b=LiS+H83b0f28ZtnJQlZY3ZAFakrDnvTRCNu5ECJzVbtd19TYsWfi95E+YAxgf1NEbVvLFC YP9DxLQbXL9868WqIfv5gHDpNO532YdZQ4WNXWssA67JT0Yy0akCjlsD/dE1U9uH8IPb3O FcP0DHG1R2AI+jyADHYtbrPFzv51qssNOjZ5idl+0ML8hSvkP6dUqS7k+dPvTpIZUq1Q6Z LVDOV8KWXnOkY8hM+qbMaqbwlMMgA7mFjeLJIf7ywb1TUa/A+J01TEHkqn1au/d3u2PVK+ 29DvEQiEnfqaFzGO8hMWP4zLJzI6XGUkMDXm+tHIc+71veDn02hGqvdSIFy3Og== 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 4bSkCy62Ztz18Lq; Thu, 26 Jun 2025 16:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55QG9oXV049211; Thu, 26 Jun 2025 16:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QG9odv049208; Thu, 26 Jun 2025 16:09:50 GMT (envelope-from git) Date: Thu, 26 Jun 2025 16:09:50 GMT Message-Id: <202506261609.55QG9odv049208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 89f6eb0a61cb - main - tcp: restrict the contents of tcp_timer.h to the kernel context List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89f6eb0a61cbd93f537a2059142edfccc1b198c7 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=89f6eb0a61cbd93f537a2059142edfccc1b198c7 commit 89f6eb0a61cbd93f537a2059142edfccc1b198c7 Author: Michael Tuexen AuthorDate: 2025-06-26 16:01:53 +0000 Commit: Michael Tuexen CommitDate: 2025-06-26 16:09:43 +0000 tcp: restrict the contents of tcp_timer.h to the kernel context The header file contains only stuff relevant in the kernel context. Reviewed by: glebius, rscheff, Peter Lei, imp Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50912 --- sys/netinet/tcp_timer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index 875f1584988c..a145782ba82d 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -32,6 +32,8 @@ #ifndef _NETINET_TCP_TIMER_H_ #define _NETINET_TCP_TIMER_H_ +#ifdef _KERNEL + /* * The TCPT_REXMT timer is used to force retransmissions. * The TCP has the TCPT_REXMT timer set whenever segments @@ -133,8 +135,6 @@ (tv) = (tvmax); \ } while(0) -#ifdef _KERNEL - #define TP_KEEPINIT(tp) ((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit) #define TP_KEEPIDLE(tp) ((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle) #define TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl)