From nobody Sun Jul 21 08:53:45 2024 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 4WRcdj4pPXz5R4xm; Sun, 21 Jul 2024 08:53:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRcdj3y1Qz4njP; Sun, 21 Jul 2024 08:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721552025; 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=gxSM0JndpPI4w03fnpPIxfugHlTmATNm//royrZeIQ4=; b=PWJeHNPNbgOkduW6insubUjAJZpxM+fCl7aQiwKqFmS/dFulVaiZ8vCoFt59NdiQyl9yqa D4rLN8YU6OxZ0GH9unGdXQEzkYxbJZPjRVZFvZ+NYOKef+QAlRWB4YXLFYnIKyheWTqF1W UIzMvQc61aglLOM5pS97SIXGioG/DzOtEhzd64WxrdJexQnAjKHGYw/Yuzkq2g5ogh0un8 XRhfMFyp4YcE4TRz7fo4CZovs2B7lwkfMOPEeBvOebmytntUlcvyYG6OWM08PX20nAKLIu GKEMf++N4lRyh8ZIm+Bk995fq2+WrlpY69GExiWh/taVnf7wBD4m/oZvX8ZgRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721552025; a=rsa-sha256; cv=none; b=fG6BStdtEK6YczdVYNwN3hTJEjviv/R+B+IpyVHlEqfulTsMa7KvBNEU1Qm6k++8hWEPHL T30cqdNKlPI3WaW76ra1JmQ5zPvQfW9VAVJspI4unK5lrVtdJO9sX1H8lSQ+SGgWNe0ZPW 3P/+Tr0yOawQYp6722KAkWTDzDyi+NtK+8hHLHt4WT844Lp/x0/8hf6HMYFAkavcH1aoqg uymPgqQxGrGz2cH5huFpG2XtGVDWoRg874z3+GsidNaMJ1XMJyC3QnmSCHDAzOBGrEmFZn AnvXJ1km5VtzuIozIT+bZAOh0QpN1aNdQUoThYST5EmgMzRVOMPj/XT9RHpNTw== 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=1721552025; 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=gxSM0JndpPI4w03fnpPIxfugHlTmATNm//royrZeIQ4=; b=pMB0srnOnSPAmlUPG3dkvfkRAtjrlnensVO972WGslRy5dDrUgq5GfTQCnowz6Jbh2B8HH 4cFVOMd4p/pOMkjntH05mnWwz0ZdMsf2ZoFHkrm+7KEhbbaMdzJXOWetrjWsuuhuJgo7qO 3R0mO2wXQcjHQJtWZhxzi+NdNIJthAvZ2nkYAQmfI3+YWl0x5tdW4eNMGCYfD5JQ3VVbdk 2957u5ChKU23+1vOHajiXvGaRVsGyeuS/Z6jNxNUoO/nqwo3wWa5Q9ppM+Z/6YOnXEHhem 1kUPxETFQt9J1a3zQj0Fn6k92Fv5HbfFnPbC5mMQ71McInZkeuzvUyHNtBLXFQ== 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 4WRcdj3YRrztdg; Sun, 21 Jul 2024 08:53:45 +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 46L8rjg1075047; Sun, 21 Jul 2024 08:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46L8rjvE075044; Sun, 21 Jul 2024 08:53:45 GMT (envelope-from git) Date: Sun, 21 Jul 2024 08:53:45 GMT Message-Id: <202407210853.46L8rjvE075044@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: 6023bd1d52b6 - main - netipsec: move declaration of the sysctl net.inet{,6}.ipsec nodes to header 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6023bd1d52b6b928927f9d2c0e3017687b29a731 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6023bd1d52b6b928927f9d2c0e3017687b29a731 commit 6023bd1d52b6b928927f9d2c0e3017687b29a731 Author: Konstantin Belousov AuthorDate: 2024-07-19 19:14:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-07-21 08:53:19 +0000 netipsec: move declaration of the sysctl net.inet{,6}.ipsec nodes to header Reviewed by: kp Sponsored by: NVIDIA networking Differential revision: https://reviews.freebsd.org/D46045 --- sys/netipsec/ipsec.c | 4 ---- sys/netipsec/ipsec.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c index e22a3872d48d..9b18cedc7a80 100644 --- a/sys/netipsec/ipsec.c +++ b/sys/netipsec/ipsec.c @@ -172,8 +172,6 @@ VNET_DEFINE(int, natt_cksum_policy) = 0; FEATURE(ipsec, "Internet Protocol Security (IPsec)"); FEATURE(ipsec_natt, "UDP Encapsulation of IPsec ESP Packets ('NAT-T')"); -SYSCTL_DECL(_net_inet_ipsec); - /* net.inet.ipsec */ SYSCTL_PROC(_net_inet_ipsec, IPSECCTL_DEF_POLICY, def_policy, CTLTYPE_INT | CTLFLAG_VNET | CTLFLAG_RW | CTLFLAG_NEEDGIANT, @@ -257,8 +255,6 @@ VNET_DEFINE(int, ip6_ipsec_ecn) = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) * VNET_DEFINE_STATIC(int, ip6_filtertunnel) = 0; #define V_ip6_filtertunnel VNET(ip6_filtertunnel) -SYSCTL_DECL(_net_inet6_ipsec6); - /* net.inet6.ipsec6 */ SYSCTL_PROC(_net_inet6_ipsec6, IPSECCTL_DEF_POLICY, def_policy, CTLTYPE_INT | CTLFLAG_VNET | CTLFLAG_RW | CTLFLAG_NEEDGIANT, diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index dfb334601331..749813518092 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -46,6 +46,7 @@ #include #include #include +#include #define IPSEC_ASSERT(_c,_m) KASSERT(_c, _m) @@ -359,6 +360,9 @@ struct mbuf *m_makespace(struct mbuf *m0, int skip, int hlen, int *off); caddr_t m_pad(struct mbuf *m, int n); int m_striphdr(struct mbuf *m, int skip, int hlen); +SYSCTL_DECL(_net_inet_ipsec); +SYSCTL_DECL(_net_inet6_ipsec6); + #endif /* _KERNEL */ #ifndef _KERNEL