From nobody Sat Oct 15 08:03:44 2022 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 4MqG3h5Sf1z4V5h0; Sat, 15 Oct 2022 08:03:44 +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 4MqG3h4t7Bz3Gc9; Sat, 15 Oct 2022 08:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665821024; 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=lISBI6v2Ts2JO8wAS/x/DXyRnXLbktdBOk/U+yUwehw=; b=wlvUqtSvIeA5E89gBLdHiIxtgAbvvfrHPq0gbM7Vvdj9XL/AiXAF/QmAuyHr0B8xbb3Eer ke4TgtzeWGUbDUnAyX5VpcErUXqJVNQVkBcby3MvxRhdIMlUzxaJACcXPUc10v2h+G1Pp7 K53WjDF2+vo/lQqXeU10UHZ9U5YLHUJcLTLJL1+SzVJnzjv7fNV1UGpUU6vObk2D90yXVR aGPjT+OaawORbRuJziGP09GsjoId9h2zLxMfRGSMDx+yohESZHgQ6zA6j/1nAC/DNyhvql XUpdwZr5zS4JZyGWQPCgVEVrE4131ftUfxyhGdMjnbDONirlbxw++LwJtXac7A== 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 4MqG3h3vCWz13bW; Sat, 15 Oct 2022 08:03:44 +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 29F83iBS037540; Sat, 15 Oct 2022 08:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29F83ibl037539; Sat, 15 Oct 2022 08:03:44 GMT (envelope-from git) Date: Sat, 15 Oct 2022 08:03:44 GMT Message-Id: <202210150803.29F83ibl037539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b37707bb3930 - main - pf: fix LINT-NOINET6 build 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: b37707bb39302af837e8f2531f448b8216ab2bb3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665821024; 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=lISBI6v2Ts2JO8wAS/x/DXyRnXLbktdBOk/U+yUwehw=; b=NfHRR+BwduFQuYM4aGeqHLEdZXds2Zz/ZHP4LdPk4SBkzzpnR+gef5PuGCC5rvteQtOfda BWgZv1B/Esb8Wkb+d9ZqvRNNPE8KUievz+9OulrEkDU/tsiFL1qV0bf5HFdkshviQFwRuL yPpxH+ntpYQasB2YNcLFuzoYkyJf0aLics4q2q0ykJ7ZNCvpNbFlKA2II9k9IFKbsRRyba D+V3CHsUimtszSV8O5kNEREfBGqxLSgyFl9A0SCQy7lqelOPaypZvM/99FnM2RmMvX4yhn ok1TbPtppCaH3mkZZUAEEKw6wkBskbO+Q0Wh5iu/Man1RLUVEw1pplVmGgndJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665821024; a=rsa-sha256; cv=none; b=cYrWK+gMCFO1Cmi73t6rcCHi7LJULOTtan5GMJ7HU1WIscEUbDf+1CYs0C3Xnx7OE5rQY9 ML0pl/Hko6+Lrzdt+9640YhZXP/Kf01SQbFC4wszVe36iSThebJIG+z7VG6TpMpf8oLUXJ uqeuJo+Vy1mk6f51mkzCBo2lzmZ41z99mH2MMGRLH/wzjZqtJtQBzeTnVE+zeMZ5rsj148 EoGBE7XDKEUPwe3VwN/3ArLA09n6sT0pfQ6/DUaRFn1KAGVhGT9YRc6TD5iS+wXjqdKVRn SPuF3ZcPiflhP9tnsehbWiuZa1JKT83in74WL8XUqC4kEojDPhyAvE1KejulWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b37707bb39302af837e8f2531f448b8216ab2bb3 commit b37707bb39302af837e8f2531f448b8216ab2bb3 Author: Kristof Provost AuthorDate: 2022-10-15 08:01:46 +0000 Commit: Kristof Provost CommitDate: 2022-10-15 08:02:35 +0000 pf: fix LINT-NOINET6 build --- sys/netpfil/pf/pf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index d0139dc6bd15..698e0588c1db 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3073,14 +3073,18 @@ pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af, struct pf_mtag *pf_mtag; /* ICMP packet rate limitation. */ +#ifdef INET6 if (af == AF_INET6) { if (icmp6_ratelimit(NULL, type, code)) return; - } else { - MPASS(af == AF_INET); + } +#endif +#ifdef INET + if (af == AF_INET) { if (badport_bandlim(pf_icmp_to_bandlim(type)) != 0) return; } +#endif /* Allocate outgoing queue entry, mbuf and mbuf tag. */ pfse = malloc(sizeof(*pfse), M_PFTEMP, M_NOWAIT);