Page MenuHomeFreeBSD
Files F144300865

D41146.id125007.diff
No OneTemporary
Actions

D41146.id125007.diff
View Options

diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c
--- a/sys/arm/allwinner/if_awg.c
+++ b/sys/arm/allwinner/if_awg.c
@@ -988,7 +988,7 @@
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
--- a/sys/arm64/broadcom/genet/if_genet.c
+++ b/sys/arm64/broadcom/genet/if_genet.c
@@ -1040,7 +1040,7 @@
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
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -5370,7 +5370,7 @@
* 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
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -5576,7 +5576,7 @@
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);
@@ -5717,7 +5717,7 @@
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
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -1134,7 +1134,7 @@
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
--- a/sys/dev/eqos/if_eqos.c
+++ b/sys/dev/eqos/if_eqos.c
@@ -597,7 +597,7 @@
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
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -1379,7 +1379,7 @@
/*
* 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
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -2623,7 +2623,7 @@
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
--- a/sys/dev/ntb/if_ntb/if_ntb.c
+++ b/sys/dev/ntb/if_ntb/if_ntb.c
@@ -328,7 +328,7 @@
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
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -4910,18 +4910,6 @@
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
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -630,8 +630,6 @@
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);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 8, 5:42 PM (12 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28480183
Default Alt Text
D41146.id125007.diff (3 KB)

Event Timeline