From nobody Tue Aug 20 20:46:34 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 4WpM2L3QvSz5SbGr; Tue, 20 Aug 2024 20:46:34 +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 4WpM2L2xKxz4hxp; Tue, 20 Aug 2024 20:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724186794; 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=ehmWc3JHKxwItYVwWlp3w+CZ5fAqXQrNcbrrLAa1iZ0=; b=SgOUV0rPcfUsLRHhRzgFR6ANo7gKSKD4YwEPdinZRHXzC52qaNKagdlPOcaW01WV7vI532 EYVakj/al30tq3SIF+wgjrIhBKFYfl6YMRqfr5q4s3Mg4H4YPxFXJxJqvWqnC1kRPqofww kCohANP1it+7Q41KAv/dDhrG8q5RurppfxeC2TgVtroDpx+p0L3ZTiYUEfbdVquzPGXz5p PP1OIgLlQs9FXqcDfXZc/wh1m4TOgclZX18/cDyBI7Juw3dpCwPyWraIOizWhywi/4W7rY yoAHSq7eTrtg3UFSUw8c+Ls+2LShU+MewE+Zf8+Bpvdl1VJ5JE8amRIk/Tj69w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724186794; a=rsa-sha256; cv=none; b=XbW/Y0cXtTioQKGT7Kry39oE6L5DLvs0cRIQrdSKJ/0gNzdRrWWV+SwrhhJPdbw+NRQ0yN fOH0znv/U1qZ9qgYzIRgQJWIAOhxv1WH3StVZv8e4MyxT4svpCFYtGJLLJfmQyPfpBE9Le 4evhhQGAISitTWYSD5xjCF6vLv0HxD37K+NOzrz+E3rIXXeGfbf0uch6iY7vPa1ibC2g90 b/P5S/WHOdI4tbWkiMyA7Aif8mKXLyxyuknLyAp9k3hSGKw4WULeRWMjEHCg5fbaemlFRt 9gGZlVH2gfp7zE88rkck6D2qPGsIXM4r2gWtc2E6NVyrtEKY6escvTWR5xSgEg== 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=1724186794; 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=ehmWc3JHKxwItYVwWlp3w+CZ5fAqXQrNcbrrLAa1iZ0=; b=HoC86Hbs7X2iFug+CqfOaSTawxGN0C3JDMg2sqzVFj0T6M7+Tx/B2TwqiYRJZvgZQ9gD2R lgKVL6f+b7G+Tj49FXKQaLVoUvd5hGlOJiJb5SCRKRe1vCwCRqL+IdPxL3Eai92v/RXBBr 7U44hiQ6h9fX8wP1+fRNlNtZQYVbDL8FzAcxOI+GRe4euI0Bm7trT8rpKZtdZ9bT+++vUw aITeINqessz5KNa+jf2k0EMX/C3VlzltJGac+GmgVHDuozl5b8OTWMw65akS5FePG67FVr nBS15KI6tZcx/Qmbm0cIdUZAkTcoJ5FuMS+RYIF5YW5U5DtR+MSTLOmQaQEz5g== 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 4WpM2L2TDvzFw8; Tue, 20 Aug 2024 20:46:34 +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 47KKkYeX070191; Tue, 20 Aug 2024 20:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47KKkYf5070188; Tue, 20 Aug 2024 20:46:34 GMT (envelope-from git) Date: Tue, 20 Aug 2024 20:46:34 GMT Message-Id: <202408202046.47KKkYf5070188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: aa72c5bacb5f - main - dummymbuf: fix build without INET or INET6 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa72c5bacb5f7ab359a3b7ae07b7c7b8705b60a8 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=aa72c5bacb5f7ab359a3b7ae07b7c7b8705b60a8 commit aa72c5bacb5f7ab359a3b7ae07b7c7b8705b60a8 Author: Gleb Smirnoff AuthorDate: 2024-08-20 20:45:38 +0000 Commit: Gleb Smirnoff CommitDate: 2024-08-20 20:45:38 +0000 dummymbuf: fix build without INET or INET6 Note that VIMAGE would mask both compilation failures. --- sys/net/dummymbuf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/net/dummymbuf.c b/sys/net/dummymbuf.c index cb92889c5b77..8c46421888ed 100644 --- a/sys/net/dummymbuf.c +++ b/sys/net/dummymbuf.c @@ -117,11 +117,15 @@ SYSCTL_PROC(_net_dummymbuf, OID_AUTO, hits, * pfil(9) context */ +#ifdef INET VNET_DEFINE_STATIC(pfil_hook_t, dmb_pfil_inet_hook); #define V_dmb_pfil_inet_hook VNET(dmb_pfil_inet_hook) +#endif +#ifdef INET6 VNET_DEFINE_STATIC(pfil_hook_t, dmb_pfil_inet6_hook); #define V_dmb_pfil_inet6_hook VNET(dmb_pfil_inet6_hook) +#endif VNET_DEFINE_STATIC(pfil_hook_t, dmb_pfil_ethernet_hook); #define V_dmb_pfil_ethernet_hook VNET(dmb_pfil_ethernet_hook) @@ -321,6 +325,7 @@ dmb_pfil_mbuf_chk(int pfil_type, struct mbuf **mp, struct ifnet *ifp, return (PFIL_PASS); } +#ifdef INET static pfil_return_t dmb_pfil_inet_mbuf_chk(struct mbuf **mp, struct ifnet *ifp, int flags, void *ruleset, struct inpcb *inp) @@ -328,7 +333,9 @@ dmb_pfil_inet_mbuf_chk(struct mbuf **mp, struct ifnet *ifp, int flags, return (dmb_pfil_mbuf_chk(PFIL_TYPE_IP4, mp, ifp, flags, ruleset, inp)); } +#endif +#ifdef INET6 static pfil_return_t dmb_pfil_inet6_mbuf_chk(struct mbuf **mp, struct ifnet *ifp, int flags, void *ruleset, struct inpcb *inp) @@ -336,6 +343,7 @@ dmb_pfil_inet6_mbuf_chk(struct mbuf **mp, struct ifnet *ifp, int flags, return (dmb_pfil_mbuf_chk(PFIL_TYPE_IP6, mp, ifp, flags, ruleset, inp)); } +#endif static pfil_return_t dmb_pfil_ethernet_mbuf_chk(struct mbuf **mp, struct ifnet *ifp, int flags,