From nobody Wed Sep 3 04:38:45 2025 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 4cGqcj6LPfz66NYy; Wed, 03 Sep 2025 04:38:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGqcj5r0Fz3vvC; Wed, 03 Sep 2025 04:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756874325; 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=y3CZTIu9gz1On9431sYkp/4NY6J9k10D+0/hcsdYdoM=; b=dyoHy7+gFMSVgZH1zfJwZ8ysg/DDtlzT4bmNcs6Kol/gTwBW1491OYxxeXCp31a5UzzC69 /h1z+sQhb+eC0wQvFqCt7LfEg/AkIP3bWWvdFDk0/YMobquCp6UbtmusdNFnM4aAUyggdE eonb2kOkaSe8b8/aKu8Gs+aYyR6ryFSMGpg5WmOlgBJ+jKkTYAekcHeYFRXzduEDE9FAj5 f6Kpd7asQ9dCEpbtFyGNNMn5+/Np3Q32ZoQEYoKIQ2h4pKfH3cw1WzWTd3TQnHUgNugPoL PoaLfYFt7c0b6jc/RiaZw/eRA32HimjrncCeZ5UlLxiHxRwHzEtJX3sDW4IBGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756874325; 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=y3CZTIu9gz1On9431sYkp/4NY6J9k10D+0/hcsdYdoM=; b=uwKxafE3CxmQni1m0C89QXIBMj0IsWeRUsJ/4xMJj8WxckveH54LneXK0NnewpXbWkniBQ B2Sj4m4iwH/u0rWF2eKLfWXJCB7lsK4dKuOGwdcQrWtQvwmAI82RflvHekSul4DPP+vQMO odwjVvybJRVAPbCcJm+H4p+fsS/SuQMR8RFdUz6g/Ay6zXt/0+WzaFhPLEcOe84sPairkG 5NDRFUy4JSdZvO66sBEjSbr2KsQvWS9TCv+c/UkLtLE9UlYK+1SOg1qTPYoYuEQ3hRfmRT sDRTY31/28Z3wSFtXVD2UX2r0OyoacbUaSR+spinQWFnKkV4JLm5RSNLc2gLFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756874325; a=rsa-sha256; cv=none; b=Z4ssl21TEOyIJMFTiky0inmZZoSLTDpNr05OYZSIMfI3cq2I1wQLxnY5C9geOAcEmvmP/M BJHbh3XzPd903eEp0OSi9gLfvQUCl4++xnhbWsiSOklFWJLl2tRFyaLDIgDWKZov9pJ4KK B2jybQaSHfGNHmO+xWmrPLRn/q6qdCTUKhj0DQME+nasARUlO49oAzKM9z366JX0kRlz7F eJkWugXSvg7fNmgiY+5UT6vow6XSeqInJvN+ATWZbdNEgGVgPrb2//P6MUmvKKRIK5/BLg tX7oWKKAzPcsW8ZZDwbGhElu/UAkn13zN2pm1MdW7rZFr/CA4CeYURnKETDLhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cGqcj55nNz1GqN; Wed, 03 Sep 2025 04:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5834cjan073547; Wed, 3 Sep 2025 04:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5834cjfM073544; Wed, 3 Sep 2025 04:38:45 GMT (envelope-from git) Date: Wed, 3 Sep 2025 04:38:45 GMT Message-Id: <202509030438.5834cjfM073544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: bceb9c2f2b19 - stable/14 - IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bceb9c2f2b1933d7172feb6597a31a6547960005 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bceb9c2f2b1933d7172feb6597a31a6547960005 commit bceb9c2f2b1933d7172feb6597a31a6547960005 Author: Justin Hibbits AuthorDate: 2023-07-21 18:16:25 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-03 04:36:30 +0000 IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() Summary: These came in the original DrvAPI commits in 2014, and are obsoleted by bpf_mtap_if() and ether_bpf_mtap_if(). The `_if` suffix, rather than prefix, conveys that it's operating on the bpf of the interface, instead than the interface itself. Reviewed by: glebius Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41146 (cherry picked from commit 2a3716432d209c5fef1eb1a719f4c1914e7c8b5a) --- sys/arm/allwinner/if_awg.c | 2 +- sys/arm64/broadcom/genet/if_genet.c | 2 +- sys/dev/bge/if_bge.c | 2 +- sys/dev/bxe/bxe.c | 4 ++-- sys/dev/dwc/if_dwc.c | 2 +- sys/dev/eqos/if_eqos.c | 2 +- sys/dev/fxp/if_fxp.c | 2 +- sys/dev/nfe/if_nfe.c | 2 +- sys/dev/ntb/if_ntb/if_ntb.c | 2 +- sys/net/if.c | 12 ------------ sys/net/if_var.h | 2 -- 11 files changed, 10 insertions(+), 24 deletions(-) diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index 566ba329e956..f511dd2309bb 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -984,7 +984,7 @@ awg_start_locked(struct awg_softc *sc) if_sendq_prepend(ifp, m); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); } if (cnt != 0) { diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index 7dab488501c3..9846861e7c67 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -1036,7 +1036,7 @@ gen_start_locked(struct gen_softc *sc) if_sendq_prepend(ifp, m); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); } } diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 7aa25939fcf0..6c3301b1473a 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -5355,7 +5355,7 @@ bge_start_locked(if_t ifp) * If there's a BPF listener, bounce a copy of this frame * to him. */ - if_bpfmtap(ifp, m_head); + bpf_mtap_if(ifp, m_head); } if (count > 0) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 45e8f654c36a..3e7120a42a90 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -5565,7 +5565,7 @@ bxe_tx_start_locked(struct bxe_softc *sc, tx_count++; /* send a copy of the frame to any BPF listeners. */ - if_etherbpfmtap(ifp, m); + ether_bpf_mtap_if(ifp, m); tx_bd_avail = bxe_tx_avail(sc, fp); @@ -5706,7 +5706,7 @@ bxe_tx_mq_start_locked(struct bxe_softc *sc, tx_count++; /* send a copy of the frame to any BPF listeners */ - if_etherbpfmtap(ifp, next); + ether_bpf_mtap_if(ifp, next); drbr_advance(ifp, tx_br); } diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index cec3ebfbf4bb..18e86ac025d4 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -1132,7 +1132,7 @@ dwc_txstart_locked(struct dwc_softc *sc) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); sc->tx_map_head = next_txidx(sc, sc->tx_map_head); sc->tx_mapcount++; ++enqueued; diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c index 7c0335079195..a52a8ca23efd 100644 --- a/sys/dev/eqos/if_eqos.c +++ b/sys/dev/eqos/if_eqos.c @@ -597,7 +597,7 @@ eqos_start_locked(if_t ifp) if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); break; } - if_bpfmtap(ifp, m); + bpf_mtap_if(ifp, m); pending++; } diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index c8f35e80fb17..260fb141983e 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -1358,7 +1358,7 @@ fxp_start_body(if_t ifp) /* * Pass packet to bpf if there is a listener. */ - if_bpfmtap(ifp, mb_head); + bpf_mtap_if(ifp, mb_head); } /* diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index 27a2a3315db4..0ab1c45b600e 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -2616,7 +2616,7 @@ nfe_start_locked(if_t ifp) break; } enq++; - if_etherbpfmtap(ifp, m0); + ether_bpf_mtap_if(ifp, m0); } if (enq > 0) { diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c index 59a2e76ee143..152ba23e06cd 100644 --- a/sys/dev/ntb/if_ntb/if_ntb.c +++ b/sys/dev/ntb/if_ntb/if_ntb.c @@ -322,7 +322,7 @@ ntb_transmit_locked(struct ntb_net_queue *q) CTR0(KTR_NTB, "TX: ntb_transmit_locked"); while ((m = drbr_peek(ifp, q->br)) != NULL) { CTR1(KTR_NTB, "TX: start mbuf %p", m); - if_etherbpfmtap(ifp, m); + ether_bpf_mtap_if(ifp, m); len = m->m_pkthdr.len; mflags = m->m_flags; rc = ntb_transport_tx_enqueue(q->qp, m, m, len); diff --git a/sys/net/if.c b/sys/net/if.c index 07369c4512cf..f308edd24734 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4866,18 +4866,6 @@ if_gethandle(u_char type) return (if_alloc(type)); } -void -if_bpfmtap(if_t ifp, struct mbuf *m) -{ - BPF_MTAP(ifp, m); -} - -void -if_etherbpfmtap(if_t ifp, struct mbuf *m) -{ - ETHER_BPF_MTAP(ifp, m); -} - void if_vlancap(if_t ifp) { diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 74692e916558..b8a0b3d3fcd1 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -629,8 +629,6 @@ int if_vlantrunkinuse(if_t ifp); caddr_t if_getlladdr(const if_t ifp); struct vnet *if_getvnet(const if_t ifp); void *if_gethandle(u_char); -void if_bpfmtap(if_t ifp, struct mbuf *m); -void if_etherbpfmtap(if_t ifp, struct mbuf *m); void if_vlancap(if_t ifp); int if_transmit(if_t ifp, struct mbuf *m); void if_init(if_t ifp, void *ctx);