diff options
author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2014-09-28 19:05:22 +0000 |
---|---|---|
committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2014-09-28 19:05:22 +0000 |
commit | c6682d59068eb7d59c06f82468655cd4bbeb9133 (patch) | |
tree | e4909fbdd34263e4844e31d151f591336d51f6a0 /sys/dev | |
parent | 03f90784bf93e340f15c88423dd926de57da8b39 (diff) | |
download | src-c6682d59068eb7d59c06f82468655cd4bbeb9133.tar.gz src-c6682d59068eb7d59c06f82468655cd4bbeb9133.zip |
Convert most BPF_TAP users to BPF_MTAP.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=272266
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ce/if_ce.c | 7 | ||||
-rw-r--r-- | sys/dev/cp/if_cp.c | 2 | ||||
-rw-r--r-- | sys/dev/ctau/if_ct.c | 2 | ||||
-rw-r--r-- | sys/dev/cx/if_cx.c | 2 | ||||
-rw-r--r-- | sys/dev/ie/if_ie.c | 9 |
5 files changed, 6 insertions, 16 deletions
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c index 36c4ba47d98b..d0dd0c7cc414 100644 --- a/sys/dev/ce/if_ce.c +++ b/sys/dev/ce/if_ce.c @@ -1133,12 +1133,7 @@ static void ce_receive (ce_chan_t *c, unsigned char *data, int len) m->m_pkthdr.rcvif = d->ifp; /* Check if there's a BPF listener on this interface. * If so, hand off the raw packet to bpf. */ -#if __FreeBSD_version >= 500000 - BPF_TAP (d->ifp, data, len); -#else - if (d->ifp->if_bpf) - bpf_tap (d->ifp, data, len); -#endif + BPF_MTAP(d->ifp, m); IF_ENQUEUE(&d->rqueue, m); #endif } diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c index ca6aaf40a038..4e70838fcd9d 100644 --- a/sys/dev/cp/if_cp.c +++ b/sys/dev/cp/if_cp.c @@ -902,7 +902,7 @@ static void cp_receive (cp_chan_t *c, unsigned char *data, int len) m->m_pkthdr.rcvif = d->ifp; /* Check if there's a BPF listener on this interface. * If so, hand off the raw packet to bpf. */ - BPF_TAP (d->ifp, data, len); + BPF_MTAP(d->ifp, m); IF_ENQUEUE (&d->queue, m); #endif } diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c index 5cf20ddf55e2..397c3ac49b25 100644 --- a/sys/dev/ctau/if_ct.c +++ b/sys/dev/ctau/if_ct.c @@ -1120,7 +1120,7 @@ static void ct_receive (ct_chan_t *c, char *data, int len) m->m_pkthdr.rcvif = d->ifp; /* Check if there's a BPF listener on this interface. * If so, hand off the raw packet to bpf. */ - BPF_TAP (d->ifp, data, len); + BPF_MTAP(d->ifp, m); IF_ENQUEUE (&d->queue, m); #endif } diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c index eecab5fadc4d..360e1f689fa9 100644 --- a/sys/dev/cx/if_cx.c +++ b/sys/dev/cx/if_cx.c @@ -1318,7 +1318,7 @@ static void cx_receive (cx_chan_t *c, char *data, int len) m->m_pkthdr.rcvif = d->ifp; /* Check if there's a BPF listener on this interface. * If so, hand off the raw packet to bpf. */ - BPF_TAP (d->ifp, data, len); + BPF_MTAP(d->ifp, m); IF_ENQUEUE (&d->queue, m); #endif } diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index eceac6c52120..72e2559cdb0c 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -949,6 +949,8 @@ iestart_locked(struct ifnet *ifp) if (!m) break; + BPF_MTAP(ifp, m); + buffer = sc->xmit_cbuffs[sc->xmit_count]; len = 0; @@ -961,13 +963,6 @@ iestart_locked(struct ifnet *ifp) m_freem(m0); len = max(len, ETHER_MIN_LEN); - /* - * See if bpf is listening on this interface, let it see the - * packet before we commit it to the wire. - */ - BPF_TAP(sc->ifp, - (void *)sc->xmit_cbuffs[sc->xmit_count], len); - sc->xmit_buffs[sc->xmit_count]->ie_xmit_flags = IE_XMIT_LAST|len; sc->xmit_buffs[sc->xmit_count]->ie_xmit_next = 0xffff; |