From nobody Fri Apr 12 16:52:53 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 4VGN0k1t2Hz5HjNp; Fri, 12 Apr 2024 16:52:54 +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 4VGN0k02XJz3x97; Fri, 12 Apr 2024 16:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712940774; 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=JbemtQpMCuHVNJVwMakJoVl866myMSENHDxVXullOWE=; b=R1a4faPFVtLkDq7GLtzDj3nRbrsMJqWKFRdsFkztr+h//KirRg/H71GmbZb+D0VTt7jG3h NDwL7BIaeYVCbvM0eAflfbCkhQF9dsVc+GMyY+AT7eCnRE/RkDaTcm7TgU1GjEIOJ8tPqc A1AJ2CfVQ8EKx19gWVgEuRf1Dz4G0jFk2AfrNElYTN4M4jw4XU7pQRgpuRKltAMJ7SqQDA B0nlQaUK4b+JhX1Bw82TdGlo1IjWJhD0xTLjmvNqfJ8/99vKo3SWkNmn54Ni65swBZA5H0 hCE1B5pBus2+7hjUGohjUCDR4rjzghZ+4aY4So7iNwCtQFh4zPCSZZk0ALq19g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712940774; a=rsa-sha256; cv=none; b=TjUFfnErIUBiHI1Dswu7X3ZnaU+LTixzHnAMcUfQcphhQn0EjlSjG7spJn9/UVQ0oNbno6 m3YrLriiAx9W6goL/HfT66ia60ezrgNK6XndkAVe4FxOnxwkD1yguEWW48p70JmMNz6mNn EsfdUE9QyHwE+A97sbA5lOt8XBxlSzhYoQL1Zjt+DPIKjeBUTvqLFCujvL3hXwzLIw/1SF CUtbuEVr6FpCaAp/koOgAfpsH/AQZS947nn0EBMYhaXXReK8nQgT0wP0DhMZZmzP52xIxB hDxB8eyAWku8eEzEY/HG5/IcCyU0DmIt8IL7LrUzuEk7egoGh6uzQ4w8/REeDQ== 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=1712940774; 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=JbemtQpMCuHVNJVwMakJoVl866myMSENHDxVXullOWE=; b=ly4QXFYjBf78YyXGDTeeze3Ihk2T14U3NqNILQy9aAGuSa7XXNlxRzke1TbDATrkJAshwo LBZ/Hcl2y86tjaBknYPBCJLUmhchH83e/AYnL5y3lF8x4kiXOby9PdZ19QdQyNbXIXiJFi CbF6HkYYo8Gh0GAfQz+zzdqc/OGdgsAR9MJD+l90ePX1T4eepxDpcEDpVqWrFTrdkw90g6 sgKipt4aI4dcKOgGecN0oDAeKMwfcE87T9nJTMRIvDHZyabHebQRSMtIkafhvBWf8EiJXl L/kO+ypfAdXJaesI3U2uIKvzD6KAKsUscKZv97eYxMqvJrIg76aaBrZlG7/p/A== 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 4VGN0j6lmzzxn4; Fri, 12 Apr 2024 16:52:53 +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 43CGqreV040046; Fri, 12 Apr 2024 16:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43CGqrrF040043; Fri, 12 Apr 2024 16:52:53 GMT (envelope-from git) Date: Fri, 12 Apr 2024 16:52:53 GMT Message-Id: <202404121652.43CGqrrF040043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 122dd78c143e - main - sys/netipsec: fix IPSEC_SUPPORT for non-INET kernels 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 122dd78c143e3d138b5d503a30da4c326f41002a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=122dd78c143e3d138b5d503a30da4c326f41002a commit 122dd78c143e3d138b5d503a30da4c326f41002a Author: Lexi Winter AuthorDate: 2024-04-12 16:30:20 +0000 Commit: Warner Losh CommitDate: 2024-04-12 16:30:22 +0000 sys/netipsec: fix IPSEC_SUPPORT for non-INET kernels The functions ipsec_kmod_udp_input() and ipsec_kmod_udp_pcbctl() are used by netinet6 for IPSEC_SUPPORT, but are guarded behind #ifdef INET. Since neither of these require INET, remove the guard so they're built even without INET. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1158 --- sys/netipsec/subr_ipsec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netipsec/subr_ipsec.c b/sys/netipsec/subr_ipsec.c index ce874bcd57b5..a1eb8f220525 100644 --- a/sys/netipsec/subr_ipsec.c +++ b/sys/netipsec/subr_ipsec.c @@ -328,6 +328,15 @@ static struct ipsec_support ipv4_ipsec = { .methods = NULL }; struct ipsec_support * const ipv4_ipsec_support = &ipv4_ipsec; +#endif + +#ifdef INET6 +static struct ipsec_support ipv6_ipsec = { + .enabled = 0, + .methods = NULL +}; +struct ipsec_support * const ipv6_ipsec_support = &ipv6_ipsec; +#endif IPSEC_KMOD_METHOD(int, ipsec_kmod_udp_input, sc, udp_input, METHOD_DECL(struct ipsec_support * const sc, struct mbuf *m, @@ -338,15 +347,6 @@ IPSEC_KMOD_METHOD(int, ipsec_kmod_udp_pcbctl, sc, udp_pcbctl, METHOD_DECL(struct ipsec_support * const sc, struct inpcb *inp, struct sockopt *sopt), METHOD_ARGS(inp, sopt) ) -#endif - -#ifdef INET6 -static struct ipsec_support ipv6_ipsec = { - .enabled = 0, - .methods = NULL -}; -struct ipsec_support * const ipv6_ipsec_support = &ipv6_ipsec; -#endif IPSEC_KMOD_METHOD(int, ipsec_kmod_input, sc, input, METHOD_DECL(struct ipsec_support * const sc, struct mbuf *m,