git: ecc393594dbe - main - pf: remove PF_TAG_GENERATED
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 11 Jan 2022 10:16:56 UTC
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=ecc393594dbe8ca9f19d3dc9767dc2323587a173
commit ecc393594dbe8ca9f19d3dc9767dc2323587a173
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2022-01-10 17:40:55 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
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