From nobody Mon Jun 29 20:20:29 2026 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 4gpyML3gsdz6jnVR for ; Mon, 29 Jun 2026 20:20:30 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpyML17nXz3KPW for ; Mon, 29 Jun 2026 20:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782764430; 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=8ff+poI1jOxgXELHUUYlIcbGK52+/9CyIqbF24BEDXo=; b=ROoI4vEfiScyHntrQKvV70exk0ASo8ZXG09myX/DLmuUoLTli/qLtWQA3Raf1PMpVgRXIc TikOeXCdkdV7faeg/hnYsZEq0ntq3VqAN0C7xbL1FnaC0ZzS2tflDRFJ2bKddYGgcZGN3b fJXTgdKFIrls8rNhQKAyx20mbpkXDbY7CzNexvJsBPtEEskm6pfVx0E4h+LI2JayLEBLPp 0rPYx187jWvSGaxV7oa/fgV9qELIFWwzHSljgaPU6xeiiN7b/jq0BTOkWWBcspC962iR34 33O0rK/XgvtnTz9VTybLFEIg1swpd/a0PjA1Tf63aOHClgehZI8td81YFSBUEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782764430; a=rsa-sha256; cv=none; b=DGFAVlzA5mXD1jUWTI8Xe5RIH4Bol1cN3blL6cBr2jHaSF+v+7doS0EZz+83QRkN5OiJHC DAgzmfuhZvu8p7nHbV7BE7FIUAv00qRScfsVsQr8uheAWn1NSZH4bGbUMaXj3nCtzvSGd5 pEG6F4OXzW2rAVEdZQMvfKIJwc1O9Ow/A9sHc6ma/7nAtiBLWOCShwK9CxQ0L9AYHyrpay SUWP3fjPTOyzH9kKMAXFmHGF2eZ7JhLypCzh7L461PHQU4BQvQjB71KzrLaJ6susmDGJOH 1S2pxgZraMJRxCLX7UHzqKrXHs5Tdwz0+Q9l5+BrQGvQDR+3RNn667222seLoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782764430; 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=8ff+poI1jOxgXELHUUYlIcbGK52+/9CyIqbF24BEDXo=; b=mHlRxlyosHhvzaRhizbM7+8lnFfXMX/8vswejLRQOt4g2VwRMfSyAE/hTiuM3evyGkzUUa rd/dcZOXdDaXcCe40gtKLGeVEHv6Hlqy6/Ctbmfc0MLcLUdrRUmX5ZMSnVYj9cWNPUKg4L D297bGZJ8aGcz1XebyWFJ2BkmyXcTY4aKJ49LkJY56DUsPAZ8CH5YOycU1tgrqbefOylvQ mGxeKVwG5KrVymDKXfg9THfkpUX48vUsO3l1wMtMEDjprTrvhbDfpwV3EluWhJu/8luF80 8bdVRe+qdOTrSKDDqgy/1IK2+8NZKWFpVZZj6xVdYLpQSuQCeW700xE2Aoy83Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpyML03ddz1C0k for ; Mon, 29 Jun 2026 20:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27d95 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 20:20:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: bdd0c4d0a7fe - main - netinet6: cleanse safeguards against IFT_PFLOG 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdd0c4d0a7fe6db4c2c8f66fa260abe9d3049118 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 20:20:29 +0000 Message-Id: <6a42d38d.27d95.19f67fcf@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=bdd0c4d0a7fe6db4c2c8f66fa260abe9d3049118 commit bdd0c4d0a7fe6db4c2c8f66fa260abe9d3049118 Author: Gleb Smirnoff AuthorDate: 2026-06-29 20:18:31 +0000 Commit: Gleb Smirnoff 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