From nobody Tue Jan 11 10:16:56 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 210431940C5A; Tue, 11 Jan 2022 10:16:57 +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 4JY67D69dfz4mWK; Tue, 11 Jan 2022 10:16:56 +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 B37A516D4F; Tue, 11 Jan 2022 10:16:56 +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 20BAGuZD057857; Tue, 11 Jan 2022 10:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BAGuJe057856; Tue, 11 Jan 2022 10:16:56 GMT (envelope-from git) Date: Tue, 11 Jan 2022 10:16:56 GMT Message-Id: <202201111016.20BAGuJe057856@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: ecc393594dbe - main - pf: remove PF_TAG_GENERATED 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: ecc393594dbe8ca9f19d3dc9767dc2323587a173 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641896216; 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=o8Wxoawe0Q522/5imB8sGICV9VD33qx+Bk6wLcfmPNk=; b=O1vXQbCST1po4r97M3Ligj3sJA+k9GHathGpmiJ/bq65bOYdArFMZj4BzMrinRrhhz5UE+ s5LkEbWJmfyxNWzOPnwdgGOJJSHoyXS3xLyp0qR0M4lvhpZi4xqeC8tvGxrYffR6S27HWs oriWejWqcCP88YC/I+DGgSmVza5GJYvQg/RvZKwcQTA1j47Dwyg5CTWhnvPeG/EvUjsEQW ew9wy2w6PjUcxgUX9EMBK3vGc9TXPEsX5agnv7hJDS7MA82+ODT8HdIZvdpbUZFQHJ8ydb Cj0UeTO5Yns3rZ1ZsoFGFhF5EwVaQThJpvmjDPaa23EYI7HK6p2sGFrgnUo0nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641896216; a=rsa-sha256; cv=none; b=iOwTxNvrxYaAN6ggGc2jVHK3RE1wFK5U6BJkuR3h4BRp5SctqgI8JKLI3LLoxmWPfoXlJU PXnHC2/2OvbtfzvYgZ3yiAzINyjlwn1r3Iz/ZMtFeGn7n70YJ9rp3UuTn67gaJMNU1j1Ln S9KI8SHHPG4DF137ImkiCzflOTAj3QpxIDCS2T15yfkCvwbFBOh1iuD0NvCiJQov3GpTbQ 8OgHL4mLPas0D0Hi/XJcjOrN+tpdj1BHm/vgfsFjJ5o5SF6VKb4I6Ptw6NsSSWqxQqPUVG ZP+mYKeJd0T2flYWGD8Pdb1atkH7cOHCcSXNaOeP+gzzm2xntJv6xd/dsLij0g== 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=ecc393594dbe8ca9f19d3dc9767dc2323587a173 commit ecc393594dbe8ca9f19d3dc9767dc2323587a173 Author: Kristof Provost AuthorDate: 2022-01-10 17:40:55 +0000 Commit: Kristof Provost CommitDate: 2022-01-11 09:09:22 +0000 pf: remove PF_TAG_GENERATED It's never set, so we can remove both the check for it and the definition. Reviewed by: mjg, glebius Pointed out by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33814 --- sys/netpfil/pf/pf.c | 3 --- sys/netpfil/pf/pf_mtag.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1686def46260..9390f0050cdc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6965,9 +6965,6 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb memset(&pd, 0, sizeof(pd)); pd.pf_mtag = pf_find_mtag(m); - if (pd.pf_mtag && pd.pf_mtag->flags & PF_TAG_GENERATED) - return (PF_PASS); - kif = (struct pfi_kkif *)ifp->if_pf_kif; if (kif == NULL) { DPFPRINTF(PF_DEBUG_URGENT, diff --git a/sys/netpfil/pf/pf_mtag.h b/sys/netpfil/pf/pf_mtag.h index e3b9426bacc8..82b8d32fbdfc 100644 --- a/sys/netpfil/pf/pf_mtag.h +++ b/sys/netpfil/pf/pf_mtag.h @@ -36,7 +36,7 @@ #ifdef _KERNEL -#define PF_TAG_GENERATED 0x01 +/* 0x01 unused. */ #define PF_TAG_DUMMYNET 0x02 #define PF_TAG_TRANSLATE_LOCALHOST 0x04 #define PF_PACKET_LOOPED 0x08