git: bdd0c4d0a7fe - main - netinet6: cleanse safeguards against IFT_PFLOG

From: Gleb Smirnoff <glebius_at_FreeBSD.org>
Date: Mon, 29 Jun 2026 20:20:29 UTC
The branch main has been updated by glebius:

URL: https://cgit.FreeBSD.org/src/commit/?id=bdd0c4d0a7fe6db4c2c8f66fa260abe9d3049118

commit bdd0c4d0a7fe6db4c2c8f66fa260abe9d3049118
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2026-06-29 20:18:31 +0000
Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2026-06-29 20:20:02 +0000

    netinet6: cleanse safeguards against IFT_PFLOG
    
    This "interface" type is no more.  Leave the constant in if_types.h, we
    probably need an exp-run before removing it.
---
 sys/net/bpf_ifnet.c         | 5 -----
 sys/netinet6/in6.c          | 1 -
 sys/netinet6/in6_ifattach.c | 6 +++---
 sys/netinet6/nd6.c          | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/sys/net/bpf_ifnet.c b/sys/net/bpf_ifnet.c
index 4123e9144fe8..b1e9b63324f3 100644
--- a/sys/net/bpf_ifnet.c
+++ b/sys/net/bpf_ifnet.c
@@ -127,11 +127,6 @@ bpf_ifnet_write(void *arg, struct mbuf *m, struct mbuf *mc, int flags)
 		hlen = sizeof(uint32_t);
 		break;
 
-	/* DLT_PFLOG */
-	case IFT_PFLOG:
-		hlen = PFLOG_HDRLEN;
-		break;
-
 	/* DLT_PFSYNC */
 	case IFT_PFSYNC:
 		hlen = PFSYNC_HDRLEN;
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index feb63bd0eaa4..2c4dd09a28db 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -2600,7 +2600,6 @@ in6_ifarrival(void *arg __unused, struct ifnet *ifp)
 
 	/* There are not IPv6-capable interfaces. */
 	switch (ifp->if_type) {
-	case IFT_PFLOG:
 	case IFT_PFSYNC:
 		ifp->if_inet6 = NULL;
 		return;
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 2f59b791a259..6c81d351fb23 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -781,7 +781,7 @@ in6_ifattach(struct ifnet *ifp, struct ifnet *altifp)
 {
 	struct in6_ifaddr *ia;
 
-	/* XXXGL: can this happen after IFT_PFLOG and IFT_PFSYNC are gone? */
+	/* XXXGL: can this happen after IFT_PFSYNC is gone? */
 	if (ifp->if_inet6 == NULL)
 		return;
 	/*
@@ -856,7 +856,7 @@ _in6_ifdetach(struct ifnet *ifp, int purgeulp)
 {
 	struct ifaddr *ifa, *next;
 
-	/* XXXGL: can this happen after IFT_PFLOG and IFT_PFSYNC are gone? */
+	/* XXXGL: can this happen after IFT_PFSYNC is gone? */
 	if (ifp->if_inet6 == NULL)
 		return;
 
@@ -913,7 +913,7 @@ in6_ifdeparture(void *arg __unused, struct ifnet *ifp)
 {
 	struct in6_ifextra *ext = ifp->if_inet6;
 
-	/* XXXGL: can this happen after IFT_PFLOG and IFT_PFSYNC are gone? */
+	/* XXXGL: can this happen after IFT_PFSYNC is gone? */
 	if (ifp->if_inet6 == NULL)
 		return;
 
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index c531d11f9e62..cc9246475e40 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -374,7 +374,7 @@ nd6_setmtu(struct ifnet *ifp)
 	struct in6_ifextra *ndi = ifp->if_inet6;
 	uint32_t omaxmtu;
 
-	/* XXXGL: safety against IFT_PFSYNC & IFT_PFLOG */
+	/* XXXGL: safety against IFT_PFSYNC */
 	if (ndi == NULL)
 		return;
 
@@ -1660,7 +1660,7 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp)
 	struct in6_ifextra *ext = ifp->if_inet6;
 	int error = 0;
 
-	/* XXXGL: safety against IFT_PFSYNC & IFT_PFLOG */
+	/* XXXGL: safety against IFT_PFSYNC */
 	if (ext == NULL)
 		return (EPFNOSUPPORT);
 #define ND	ndi->ndi