From owner-dev-commits-src-branches@freebsd.org Fri Sep 17 17:53:56 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1204E6B6EB4; Fri, 17 Sep 2021 17:53:56 +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 4HB1m36FYJz4mmT; Fri, 17 Sep 2021 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9D5DF19F9B; Fri, 17 Sep 2021 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18HHrtHb061255; Fri, 17 Sep 2021 17:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18HHrth1061254; Fri, 17 Sep 2021 17:53:55 GMT (envelope-from git) Date: Fri, 17 Sep 2021 17:53:55 GMT Message-Id: <202109171753.18HHrth1061254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1e7e7452d59b - stable/13 - pf: fix NOINET6 builds MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e7e7452d59bb688479e13df04d95346a2ae48b6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2021 17:53:56 -0000 The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1e7e7452d59bb688479e13df04d95346a2ae48b6 commit 1e7e7452d59bb688479e13df04d95346a2ae48b6 Author: Kristof Provost AuthorDate: 2021-09-10 15:20:39 +0000 Commit: Kristof Provost CommitDate: 2021-09-17 15:55:42 +0000 pf: fix NOINET6 builds MFC after: 1 week Sponsored by: Modirum MDPay (cherry picked from commit 9bdff593ead9434e01cfb6084f21c3e93a22963d) --- sys/netpfil/pf/pf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 42e8f3279599..20e775148b7a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1486,6 +1486,7 @@ static bool pf_isforlocal(struct mbuf *m, int af) { switch (af) { +#ifdef INET case AF_INET: { struct rm_priotracker in_ifa_tracker; struct ip *ip; @@ -1502,6 +1503,8 @@ pf_isforlocal(struct mbuf *m, int af) IN_IFADDR_RUNLOCK(&in_ifa_tracker); break; } +#endif +#ifdef INET6 case AF_INET6: { struct ip6_hdr *ip6; struct in6_ifaddr *ia; @@ -1511,6 +1514,7 @@ pf_isforlocal(struct mbuf *m, int af) return (false); return (! (ia->ia6_flags & IN6_IFF_NOTREADY)); } +#endif default: panic("Unsupported af %d", af); }