From nobody Mon Oct 02 09:10:03 2023 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 4RzZsl2K1bz4vpy2; Mon, 2 Oct 2023 09:10:03 +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 4RzZsl1XrYz4PPB; Mon, 2 Oct 2023 09:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696237803; 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=CVvs3I6jWAhtF3J0boYv4rGMZaajQkJP0YfTMxVDG7A=; b=T95emTNqmNs4YU4NH2bqfRNLehXaxJtHdhwuFx+pyZ1pYJyGXwIQHCXqoS1GwhTzVGSbhg +mwidwuCXP0Hlaxo+KfSA22l90K0Go53+EYHfeXNqlPUGjBWeRVddAY91b77TK0gz4fy2N glHx11Mdd0QGev32wGC3CoHNkEYnIZZ1vjc80uGVP8t1DWcRskfjozdfP2fPFvaKEFYNBH FoBbKtBP58k3Ql6b15rw+IBQfAclLdw1kCfF0wLeKv8+MlBlvm530U/hxffZSzMel9+lc5 Od/iKkTlKeLTmjW8Ko8tSkhnicRPhQ60oW4Yhn7YuISp02MD2y1NoxptHlKUbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696237803; a=rsa-sha256; cv=none; b=OpKlHfFYEhcnSh9L799oL7FepNoglPgCTmBCeoncCk8gkmla11OwasCA2V1phSWHmpELj2 hpfDNYMzwobpboEZvEPlAXjD21PnW4TBw1cRQE7B6mEgUUaXf+hOuaUW/BcG56QLCGOrHC VITJJZloxc0jVZU0AetxduYVaWLJnje/Wdr/yBVW60OOir6XDDtAPTkIabPDl4IwElpPrP OSP+kakLlsBhvqYLazzL9btmQLwiYOCINsKqaQb9EIasz+WPfL+peoyx8qgbJpt2mq5ZMY v1qOh7Fb7zgQTZydowVVe1UrwiGVEzo4rsH3gY6Rq0FpdHeLkWFLRM9lJQEomQ== 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=1696237803; 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=CVvs3I6jWAhtF3J0boYv4rGMZaajQkJP0YfTMxVDG7A=; b=maX4ugvwH+0eLEcxLL6NPLokfLcj8fXVW5c0vNDB/Dd+s4ZvaVY4oK2CuaCju5tskMQfpU scVxW/m44JQRl+qGPmHultrVeZ82elXTflo+Bv+tfGvtF15vbU2Iu7mfbD4cnofUpYYqXu vcmZZS19HI9h72rkmYApCsPAGSxExvg49/1xF0DkQAEPeHvmE3o31cw82j0Mu2LHZXm2p7 SZLScBu2Y7AKb+tvnPh6on1wYETaYm/5nHCaun7SU2y8bt2QsAl1zMP9hXbqXmExbQd/Q9 4POdjA3W9MfBQ6FCdVDHpPyfCeDduldI0IzBcAGzK6msmRhD/gTFbiDSeWSt/g== 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 4RzZsl0ckvz15h6; Mon, 2 Oct 2023 09:10:03 +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 3929A34o056151; Mon, 2 Oct 2023 09:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3929A3X5056147; Mon, 2 Oct 2023 09:10:03 GMT (envelope-from git) Date: Mon, 2 Oct 2023 09:10:03 GMT Message-Id: <202310020910.3929A3X5056147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3f44d7870593 - stable/12 - ipfilter: Add sysctl flag CTLFLAG_TUN to loader tunable 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3f44d7870593bc7fd116a27310138646a00d3fff Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3f44d7870593bc7fd116a27310138646a00d3fff commit 3f44d7870593bc7fd116a27310138646a00d3fff Author: Zhenlei Huang AuthorDate: 2023-09-29 00:01:43 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-02 09:08:55 +0000 ipfilter: Add sysctl flag CTLFLAG_TUN to loader tunable The sysctl variable `net.inet.ipf.large_nat` is actually a loader tunable. Add sysctl flag CTLFLAG_TUN to it so that `sysctl -T` will report it correctly. No functional change intended. Reviewed by: cy (for #network) Fixes: a805ffbcbce8 ipfilter: Make LARGE_NAT a tunable MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42005 (cherry picked from commit ba883e7a5ac43b27a373f2b1b0044fd2eb769d4e) (cherry picked from commit a9359dcde241f17421a71bc8c96dee08625db9dd) (cherry picked from commit 25c371dc559a9ea23905baa5cbfed3f6d9d6eb5c) --- sys/netpfil/ipfilter/netinet/mlfk_ipl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c index 0b37dab558aa..33153cca246e 100644 --- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c +++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c @@ -131,7 +131,7 @@ SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_running, CTLFLAG_RD, &VNET_NAME(ipfmain.ipf_running), 0, "IPF is running"); SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_chksrc, CTLFLAG_RW, &VNET_NAME(ipfmain.ipf_chksrc), 0, ""); SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_minttl, CTLFLAG_RW, &VNET_NAME(ipfmain.ipf_minttl), 0, ""); -SYSCTL_IPF(_net_inet_ipf, OID_AUTO, large_nat, CTLFLAG_RD, &VNET_NAME(ipfmain.ipf_large_nat), 0, "large_nat"); +SYSCTL_IPF(_net_inet_ipf, OID_AUTO, large_nat, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &VNET_NAME(ipfmain.ipf_large_nat), 0, "large_nat"); #define CDEV_MAJOR 79 #include