From d61b89e4b3e6dfee11b4cb2dec3a9f8851e300e1 Mon Sep 17 00:00:00 2001 From: Archie Cobbs Date: Wed, 24 May 2000 00:05:44 +0000 Subject: [PATCH] Avoid double-call to bpf_mtap(). This is now handled in ether_input(). --- sys/dev/tx/if_tx.c | 2 ++ sys/pci/if_tx.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index d575bca46dba..b14946083de7 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -921,11 +921,13 @@ epic_rx_done(sc) m->m_pkthdr.rcvif = &(sc->sc_if); m->m_pkthdr.len = m->m_len = len; +#if !defined(__FreeBSD__) #if NBPFILTER > 0 /* Give mbuf to BPFILTER */ if( sc->sc_if.if_bpf ) bpf_mtap( EPIC_BPFTAP_ARG(&sc->sc_if), m ); #endif /* NBPFILTER > 0 */ +#endif /* !__FreeBSD__ */ /* Second mbuf holds packet ifself */ m->m_pkthdr.len = m->m_len = len - sizeof(struct ether_header); diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c index d575bca46dba..b14946083de7 100644 --- a/sys/pci/if_tx.c +++ b/sys/pci/if_tx.c @@ -921,11 +921,13 @@ epic_rx_done(sc) m->m_pkthdr.rcvif = &(sc->sc_if); m->m_pkthdr.len = m->m_len = len; +#if !defined(__FreeBSD__) #if NBPFILTER > 0 /* Give mbuf to BPFILTER */ if( sc->sc_if.if_bpf ) bpf_mtap( EPIC_BPFTAP_ARG(&sc->sc_if), m ); #endif /* NBPFILTER > 0 */ +#endif /* !__FreeBSD__ */ /* Second mbuf holds packet ifself */ m->m_pkthdr.len = m->m_len = len - sizeof(struct ether_header);