Rename bpfilter to bpf.

18 files changed, 120 insertions, 120 deletions

diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 556a4a1c48..6677153 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.25 1999/03/30 13:28:22 phk Exp $
+ * $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
  */
 
 /*
@@ -49,7 +49,7 @@
  */
 
 #include "ar.h"
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,7 +61,7 @@
 #include <net/if.h>
 #include <net/if_sppp.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -357,7 +357,7 @@ arattach(struct isa_device *id)
 		sppp_attach((struct ifnet *)&sc->ifsppp);
 		if_attach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
 #endif
 	}
@@ -537,7 +537,7 @@ top_arstart:
 		txdata += AR_BUF_SIZ;
 		i++;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		if(ifp->if_bpf)
 			bpf_mtap(ifp, mtx);
 #endif
@@ -1299,7 +1299,7 @@ ar_get_packets(struct ar_softc *sc)
 				}
 			}
 			ar_copy_rxbuf(m, sc, len);
-#if NBPFILTER > 0
+#if NBPF > 0
 			if(sc->ifsppp.pp_if.if_bpf)
 				bpf_mtap(&sc->ifsppp.pp_if, m);
 #endif
diff --git a/sys/i386/isa/if_cs.c b/sys/i386/isa/if_cs.c
index f96f024..4863ffe 100644
--- a/sys/i386/isa/if_cs.c
+++ b/sys/i386/isa/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_cs.c,v 1.9 1999/01/28 01:59:53 dillon Exp $
+ * $Id: if_cs.c,v 1.10 1999/04/16 21:22:20 peter Exp $
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -35,7 +35,7 @@
 
 /* #define	 CS_DEBUG */
 #include "cs.h"
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -620,7 +620,7 @@ cs_attach(struct cs_softc *sc, int unit, int flags)
 		printf(CS_NAME"%d: ethernet address %6D\n",
 		       ifp->if_unit, sc->arpcom.ac_enaddr, ":");
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof (struct ether_header));
 #endif
 	return 1;
@@ -777,7 +777,7 @@ cs_get_packet(struct cs_softc *sc)
 
 	eh = mtod(m, struct ether_header *);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (ifp->if_bpf)
 		bpf_mtap(ifp, m);
 #endif
@@ -950,7 +950,7 @@ cs_start(struct ifnet *ifp)
 
 			cs_write_mbufs(sc, m);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 			if (ifp->if_bpf) {
 				bpf_mtap(ifp, m);
 			}
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index db417af..260a1c2 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -19,7 +19,7 @@
 #undef DEBUG
 
 #include "cx.h"
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_devfs.h"
 
 #include "sppp.h"
@@ -38,7 +38,7 @@
 
 #include <net/if.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -285,7 +285,7 @@ cxattach (struct isa_device *id)
 			sppp_attach (c->ifp);
 			if_attach (c->ifp);
 			sp = (struct sppp*) c->ifp;
-#if NBPFILTER > 0
+#if NBPF > 0
 			/* If BPF is in the kernel, call the attach for it. */
 			bpfattach (c->ifp, DLT_PPP, PPP_HEADER_LEN);
 #endif
@@ -481,7 +481,7 @@ cxput (cx_chan_t *c, char b)
 		return;
 	}
 	m_copydata (m, 0, len, buf);
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (c->ifp->if_bpf)
 		bpf_mtap (c->ifp, m);
 #endif
@@ -805,7 +805,7 @@ cxinput (cx_chan_t *c, void *buf, unsigned len)
 	printmbuf (m);
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/*
 	 * Check if there's a BPF listener on this interface.
 	 * If so, hand off the raw packet to bpf.
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 8775aa8..d65ac48 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.151 1999/04/16 21:22:20 peter Exp $
+ *	$Id: if_ed.c,v 1.152 1999/05/09 23:24:45 peter Exp $
  */
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include "ed.h"
-#include "bpfilter.h"
+#include "bpf.h"
 #include "pnp.h"
 
 #ifndef EXTRA_ED
@@ -65,7 +65,7 @@
 #include <net/if_dl.h>
 #include <net/if_mib.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 #include "opt_bdg.h"
@@ -1721,7 +1721,7 @@ ed_attach(sc, unit, flags)
 	/*
 	 * If BPF is in the kernel, call the attach for it
 	 */
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 	return 1;
@@ -2179,7 +2179,7 @@ outloop:
 	/*
 	 * Tap off here if there is a bpf listener.
 	 */
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (ifp->if_bpf) {
 		bpf_mtap(ifp, m0);
 	}
@@ -2621,7 +2621,7 @@ ed_ioctl(ifp, command, data)
 			}
 		}
 
-#if NBPFILTER > 0
+#if NBPF > 0
 
 		/*
 		 * Promiscuous flag may have changed, so reprogram the RCR.
@@ -2752,7 +2752,7 @@ ed_get_packet(sc, buf, len, multicast)
 		struct ifnet *ifp ;
 		int need_more = 1 ; /* in case not bpf */
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (sc->arpcom.ac_if.if_bpf) {
 			need_more = 0 ;
 			ed_ring_copy(sc, buf, (char *)eh, len);
@@ -2783,7 +2783,7 @@ ed_get_packet(sc, buf, len, multicast)
 	 */
 	ed_ring_copy(sc, buf, (char *)eh, len);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 
 	/*
 	 * Check if there's a BPF listener on this interface. If so, hand off
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index f8aad8e..0a15537 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.39 1998/12/07 21:58:21 archie Exp $
+ * $Id: if_el.c,v 1.40 1999/01/12 01:29:42 eivind Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -20,7 +20,7 @@
  *	- Does not currently support multicasts
  */
 #include "el.h"
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
@@ -48,7 +48,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -213,7 +213,7 @@ el_attach(struct isa_device *idev)
 	  sc->arpcom.ac_enaddr, ":");
 
 	/* Finally, attach to bpf filter if it is present. */
-#if NBPFILTER > 0
+#if NBPF > 0
 	dprintf(("Attaching to BPF...\n"));
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
@@ -348,7 +348,7 @@ el_start(struct ifnet *ifp)
 		len = max(len,ETHER_MIN_LEN);
 
 		/* Give the packet to the bpf, if any */
-#if NBPFILTER > 0
+#if NBPF > 0
 		if(sc->arpcom.ac_if.if_bpf)
 			bpf_tap(&sc->arpcom.ac_if, sc->el_pktbuf, len);
 #endif
@@ -438,7 +438,7 @@ elread(struct el_softc *sc,caddr_t buf,int len)
 
 	eh = (struct ether_header *)buf;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/*
 	 * Check if there's a bpf filter listening on this interface.
 	 * If so, hand off the raw packet to bpf.
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 387184e..a332304 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.78 1999/01/19 00:21:39 peter Exp $
+ *  $Id: if_ep.c,v 1.79 1999/01/31 22:41:51 dufault Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -59,7 +59,7 @@
 #include "ep.h"
 #if NEP > 0
 
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
@@ -93,7 +93,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -635,7 +635,7 @@ ep_attach(sc)
     ep_fset(F_RX_FIRST);
     sc->top = sc->mcur = 0;
 
-#if NBPFILTER > 0
+#if NBPF > 0
     if (!attached) {
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
     }
@@ -871,7 +871,7 @@ startagain:
     while (pad--)
 	outb(BASE + EP_W1_TX_PIO_WR_1, 0);	/* Padding */
 
-#if NBPFILTER > 0
+#if NBPF > 0
     if (ifp->if_bpf) {
 	bpf_mtap(ifp, top);
     }
@@ -1137,7 +1137,7 @@ read_again:
     top->m_pkthdr.rcvif = &sc->arpcom.ac_if;
     top->m_pkthdr.len = sc->cur_len;
 
-#if NBPFILTER > 0
+#if NBPF > 0
     if (ifp->if_bpf) {
 	bpf_mtap(ifp, top);
 
diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index 5411d30..8915af7 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.14 1999/01/28 01:59:53 dillon Exp $
+ *	$Id: if_ex.c,v 1.15 1999/05/02 22:01:24 peter Exp $
  */
 
 /*
@@ -37,7 +37,7 @@
 
 #include "ex.h"
 #if NEX > 0
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
@@ -65,7 +65,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -294,7 +294,7 @@ int ex_attach(struct isa_device *dev)
 	/*
 	 * If BPF is in the kernel, call the attach for it
 	 */
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 	DODEBUG(Start_End, printf("ex_attach%d: finish\n", unit););
@@ -520,7 +520,7 @@ void ex_start(struct ifnet *ifp)
       sc->tx_last = dest;
       sc->tx_tail = next;
       
-#if NBPFILTER > 0
+#if NBPF > 0
       if (ifp->if_bpf != NULL)
 	bpf_mtap(ifp, opkt);
 #endif
@@ -727,7 +727,7 @@ void ex_rx_intr(int unit)
 	  } /* QQQ */
 	  }
 #endif
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (ifp->if_bpf != NULL) {
 		bpf_mtap(ifp, ipkt);
 
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 44678ce..21eccc2 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.49 1999/03/03 10:40:26 kato Exp $
+ * $Id: if_fe.c,v 1.50 1999/05/04 12:59:59 kato Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
@@ -70,7 +70,7 @@
  */
 
 #include "fe.h"
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_fe.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
@@ -110,7 +110,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -2763,7 +2763,7 @@ fe_attach ( struct isa_device * dev )
 		       sc->sc_unit);
 	}
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/* If BPF is in the kernel, call the attach for it.  */
  	bpfattach(&sc->sc_if, DLT_EN10MB, sizeof(struct ether_header));
 #endif
@@ -3132,7 +3132,7 @@ fe_start ( struct ifnet *ifp )
 		 * and only if it is in "receive everything"
 		 * mode.)
 		 */
-#if NBPFILTER > 0
+#if NBPF > 0
 		if ( sc->sc_if.if_bpf
 		  && !( sc->sc_if.if_flags & IFF_PROMISC ) ) {
 			bpf_mtap( &sc->sc_if, m );
@@ -3764,7 +3764,7 @@ fe_get_packet ( struct fe_softc * sc, u_short len )
 
 #define ETHER_ADDR_IS_MULTICAST(A) (*(char *)(A) & 1)
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/*
 	 * Check if there's a BPF listener on this interface.
 	 * If it is, hand off the raw packet to bpf.
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 9c25836..a41b0b0 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.59 1999/01/28 01:59:53 dillon Exp $
+ *	$Id: if_ie.c,v 1.60 1999/05/13 12:21:41 bde Exp $
  */
 
 /*
@@ -125,7 +125,7 @@ iomem and and with 0xffff.
 #include <net/if_types.h>
 #include <net/if_dl.h>
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #ifdef INET
 #include <netinet/in.h>
@@ -153,7 +153,7 @@ iomem and and with 0xffff.
 #include <i386/isa/if_iee16.h>
 #include <i386/isa/elink.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -842,7 +842,7 @@ ieattach(struct isa_device *dvp)
 	if (ie->hard_type == IE_EE16)
 		at_shutdown(ee16_shutdown, ie, SHUTDOWN_POST_SYNC);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -1101,7 +1101,7 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
 		 * Receiving all multicasts, but no unicasts except those
 		 * destined for us.
 		 */
-#if NBPFILTER > 0
+#if NBPF > 0
 		/* BPF gets this packet if anybody cares */
 		*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
 #endif
@@ -1117,14 +1117,14 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
 		 * Receiving all packets.  These need to be passed on to
 		 * BPF.
 		 */
-#if NBPFILTER > 0
+#if NBPF > 0
 		*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
 #endif
 		/* If for us, accept and hand up to BPF */
 		if (ether_equal(eh->ether_dhost, ie->arpcom.ac_enaddr))
 			return (1);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (*to_bpf)
 			*to_bpf = 2;	/* we don't need to see it */
 #endif
@@ -1142,7 +1142,7 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
 		for (i = 0; i < ie->mcast_count; i++) {
 			if (ether_equal(eh->ether_dhost,
 			    (u_char *)&ie->mcast_addrs[i])) {
-#if NBPFILTER > 0
+#if NBPF > 0
 				if (*to_bpf)
 					*to_bpf = 1;
 #endif
@@ -1156,7 +1156,7 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
 		 * Acting as a multicast router, and BPF running at the same
 		 * time. Whew!	(Hope this is a fast machine...)
 		 */
-#if NBPFILTER > 0
+#if NBPF > 0
 		*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
 #endif
 		/* We want to see multicasts. */
@@ -1168,7 +1168,7 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
 			return (1);
 
 		/* Anything else goes to BPF but nothing else. */
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (*to_bpf)
 			*to_bpf = 2;
 #endif
@@ -1183,7 +1183,7 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
 		 * for the multicast filter), but it will do in this case,
 		 * and we want to get out of here as quickly as possible.
 		 */
-#if NBPFILTER > 0
+#if NBPF > 0
 		*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
 #endif
 		return (1);
@@ -1420,7 +1420,7 @@ ie_readframe(int unit, struct ie_softc *ie, int	num/* frame number to read */)
 	struct mbuf *m = 0;
 	struct ether_header eh;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	int	bpf_gets_it = 0;
 
 #endif
@@ -1439,7 +1439,7 @@ ie_readframe(int unit, struct ie_softc *ie, int	num/* frame number to read */)
 	ie->rfhead = (ie->rfhead + 1) % ie->nframes;
 
 	if (rfd.ie_fd_status & IE_FD_OK) {
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (ieget(unit, ie, &m, &eh, &bpf_gets_it)) {
 #else
 		if (ieget(unit, ie, &m, &eh, (int *)0)) {
@@ -1466,7 +1466,7 @@ ie_readframe(int unit, struct ie_softc *ie, int	num/* frame number to read */)
 		m_freem(last_not_for_us);
 		last_not_for_us = 0;
 	}
-#if NBPFILTER > 0
+#if NBPF > 0
 	/*
 	 * Check for a BPF filter; if so, hand it up. Note that we have to
 	 * stick an extra mbuf up front, because bpf_mtap expects to have
@@ -1494,7 +1494,7 @@ ie_readframe(int unit, struct ie_softc *ie, int	num/* frame number to read */)
 		last_not_for_us = m;
 		return;
 	}
-#endif				/* NBPFILTER > 0 */
+#endif				/* NBPF > 0 */
 	/*
 	 * In here there used to be code to check destination addresses upon
 	 * receipt of a packet.	 We have deleted that code, and replaced it
@@ -1578,7 +1578,7 @@ iestart(struct ifnet *ifp)
 		m_freem(m0);
 		len = max(len, ETHER_MIN_LEN);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * See if bpf is listening on this interface, let it see the
 		 * packet before we commit it to the wire.
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 384b325..a78fdce 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_le.c,v 1.49 1998/12/30 00:37:42 hoek Exp $
+ * $Id: if_le.c,v 1.50 1999/05/11 19:54:12 phk Exp $
  */
 
 /*
@@ -52,7 +52,7 @@
 #include <net/if_types.h>
 #include <net/if_dl.h>
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #ifdef INET
 #include <netinet/in.h>
@@ -77,7 +77,7 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -370,7 +370,7 @@ le_attach(
     ifp->if_addrlen = 6;
     ifp->if_hdrlen = 14;
 
-#if NBPFILTER > 0
+#if NBPF > 0
     bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -412,7 +412,7 @@ le_input(
     }
     MEMCPY(&eh, seg1, sizeof(eh));
 
-#if NBPFILTER > 0
+#if NBPF > 0
     if (sc->le_if.if_bpf != NULL && seg2 == NULL) {
 	bpf_tap(&sc->le_if, seg1, total_len);
 	/*
@@ -469,7 +469,7 @@ le_input(
     MEMCPY(mtod(m, caddr_t), seg1, len1);
     if (seg2 != NULL)
 	MEMCPY(mtod(m, caddr_t) + len1, seg2, total_len - len1);
-#if NBPFILTER > 0
+#if NBPF > 0
     if (sc->le_if.if_bpf != NULL && seg2 != NULL) {
 	bpf_mtap(&sc->le_if, m);
 	/*
@@ -1142,7 +1142,7 @@ lemac_start(
 
 	LE_OUTB(sc, LEMAC_REG_TQ, tx_pg);	/* tell chip to transmit this packet */
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (sc->le_if.if_bpf)
 		bpf_mtap(&sc->le_if, m);
 #endif
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index f058661..5fc82330 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.59 1999/05/06 18:43:57 peter Exp $
+ * $Id: if_lnc.c,v 1.60 1999/05/09 23:24:47 peter Exp $
  */
 
 /*
@@ -64,7 +64,7 @@
 #include "lnc.h"
 #if NLNC > 0
 
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_inet.h"
 
 /* Some defines that should really be in generic locations */
@@ -88,7 +88,7 @@
 #include <netinet/if_ether.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -613,7 +613,7 @@ lnc_rint(struct lnc_softc *sc)
 
 				eh = (struct ether_header *) head->m_data;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 				if (sc->arpcom.ac_if.if_bpf)
 					bpf_mtap(&sc->arpcom.ac_if, head);
 #endif
@@ -1295,7 +1295,7 @@ lnc_attach_sc(struct lnc_softc *sc, int unit)
 		printf("%s", ic_ident[sc->nic.ic]);
 	printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(&sc->arpcom.ac_if, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -1809,7 +1809,7 @@ lnc_start(struct ifnet *ifp)
 
 		ifp->if_timer = 2;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (sc->arpcom.ac_if.if_bpf)
 			bpf_mtap(&sc->arpcom.ac_if, head);
 #endif
diff --git a/sys/i386/isa/if_lnc.h b/sys/i386/isa/if_lnc.h
index 1075a3e..b2fc532 100644
--- a/sys/i386/isa/if_lnc.h
+++ b/sys/i386/isa/if_lnc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.h,v 1.9 1998/11/26 00:57:32 paul Exp $
+ * $Id: if_lnc.h,v 1.10 1999/01/31 00:56:32 paul Exp $
  */
 
 #include <i386/isa/ic/Am7990.h>
@@ -39,7 +39,7 @@
  * Initialize multicast address hashing registers to accept
  * all multicasts (only used when in promiscuous mode)
  */
-#if NBPFILTER > 0
+#if NBPF > 0
 #define MULTI_INIT_ADDR 0xff
 #else
 #define MULTI_INIT_ADDR 0
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 0d29b0a..b7c90a8 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_rdp.c,v 1.2 1998/12/21 18:11:10 joerg Exp $
+ *	$Id: if_rdp.c,v 1.3 1999/01/12 00:36:31 eivind Exp $
  */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include "rdp.h"
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +89,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -629,7 +629,7 @@ rdp_attach(struct isa_device *isa_dev)
 	/*
 	 * If BPF is in the kernel, call the attach for it
 	 */
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 	return 1;
@@ -814,7 +814,7 @@ outloop:
 	/*
 	 * Tap off here if there is a bpf listener.
 	 */
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (ifp->if_bpf) {
 		bpf_mtap(ifp, m);
 	}
@@ -862,7 +862,7 @@ rdp_ioctl(struct ifnet *ifp, IOCTL_CMD_T command, caddr_t data)
 			}
 		}
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * Promiscuous flag may have changed, propagage this
 		 * to the NIC.
@@ -1164,7 +1164,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
 	outb(sc->baseaddr + lpt_control, Ctrl_SelData);
 	WrNib(sc, CMR1, CMR1_RDPAC);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 
 	/*
 	 * Check if there's a BPF listener on this interface. If so, hand off
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index c75a9a2..ba883f7 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.22 1999/03/30 13:28:23 phk Exp $
+ * $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
  */
 
 /*
@@ -53,7 +53,7 @@
 #else
 #define NFR	0
 #endif
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include "sppp.h"
 #if NSPPP <= 0
@@ -71,7 +71,7 @@
 #include <net/if.h>
 #include <net/if_sppp.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -848,7 +848,7 @@ srattach(struct sr_hardc *hc)
 
 		if_attach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
 #endif
 	}
@@ -1119,7 +1119,7 @@ top_srstart:
 			   sc->unit, mtx, len);
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (ifp->if_bpf)
 			bpf_mtap(ifp, mtx);
 #endif
@@ -2462,7 +2462,7 @@ sr_get_packets(struct sr_softc *sc)
 			 */
 			sr_copy_rxbuf(m, sc, len);	/* copy from DPRAM */
 
-#if NBPFILTER > 0
+#if NBPF > 0
 			if (ifp->if_bpf)
 				bpf_mtap(ifp, m);
 #endif
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 5b1ba03c..4e2b2cf 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.56 1999/07/04 14:35:23 wpaul Exp $
+ *	$Id: if_wi.c,v 1.7 1999/07/04 14:40:22 wpaul Exp $
  */
 
 /*
@@ -67,7 +67,7 @@
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
 
-#include "bpfilter.h"
+#include "bpf.h"
 #include "card.h"
 #include "wi.h"
 
@@ -94,7 +94,7 @@
 #include <netinet/if_ether.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -116,7 +116,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.56 1999/07/04 14:35:23 wpaul Exp $";
+	"$Id: if_wi.c,v 1.7 1999/07/04 14:40:22 wpaul Exp $";
 #endif
 
 static struct wi_softc wi_softc[NWI];
@@ -363,7 +363,7 @@ static int wi_attach(isa_dev)
 		if_attach(ifp);
 		ether_ifattach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -463,7 +463,7 @@ static void wi_rxeof(sc)
 
 	ifp->if_ipackets++;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/* Handle BPF listeners. */
 	if (ifp->if_bpf) {
 		bpf_mtap(ifp, m);
@@ -1239,7 +1239,7 @@ static void wi_start(ifp)
 		    m0->m_pkthdr.len + 2);
 	}
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/*
 	 * If there's a BPF listner, bounce a copy of
 	 * this frame to him.
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 3370477..9a4fbd7 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.20 1999/01/12 00:36:31 eivind Exp $ */
+/* $Id: if_wl.c,v 1.21 1999/04/27 11:15:02 phk Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -190,7 +190,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "wl.h"
 #include "opt_wavelan.h"
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
@@ -214,7 +214,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <netinet/if_ether.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -510,7 +510,7 @@ wlattach(struct isa_device *id)
     if_attach(ifp);
     ether_ifattach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
     bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -895,7 +895,7 @@ wlstart(struct ifnet *ifp)
     ifp = &(sc->wl_if);
     IF_DEQUEUE(&ifp->if_snd, m);
     if (m != (struct mbuf *)0) {
-#if NBPFILTER > 0
+#if NBPF > 0
 	/* let BPF see it before we commit it */
 	if (ifp->if_bpf) {
 	    bpf_mtap(ifp, m);
@@ -1080,7 +1080,7 @@ wlread(int unit, u_short fd_p)
 
     m->m_pkthdr.len = clen;
 
-#if NBPFILTER > 0
+#if NBPF > 0
     /*
      * Check if there's a BPF listener on this interface. If so, hand off
      * the raw packet to bpf.
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 28fbaa9..6d3671b 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.57 1999/05/06 18:12:27 peter Exp $
+ * $Id: if_ze.c,v 1.58 1999/05/06 18:43:58 peter Exp $
  */
 
 /* XXX don't mix different PCCARD support code. */
@@ -64,7 +64,7 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
 
 #include "ze.h"
 #if	NZE > 0
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
@@ -92,7 +92,7 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -650,7 +650,7 @@ ze_attach(isa_dev)
 	/*
 	 * If BPF is in the kernel, call the attach for it
 	 */
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -871,7 +871,7 @@ ze_init(unit)
 	for (i = 0; i < ETHER_ADDR_LEN; ++i)
 		outb(sc->nic_addr + ED_P1_PAR0 + i, sc->arpcom.ac_enaddr[i]);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/*
 	 * Initialize multicast address hashing registers to accept
 	 *	 all multicasts (only used when in promiscuous mode)
@@ -1042,7 +1042,7 @@ outloop:
 	/*
 	 * If there is BPF support in the configuration, tap off here.
 	 */
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (ifp->if_bpf) {
 		bpf_mtap(ifp, m0);
 	}
@@ -1434,7 +1434,7 @@ ze_ioctl(ifp, command, data)
 		    	    ((ifp->if_flags & IFF_RUNNING) == 0))
 				ze_init(ifp->if_unit);
 		}
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (ifp->if_flags & IFF_PROMISC) {
 			/*
 			 * Set promiscuous mode on interface.
@@ -1518,7 +1518,7 @@ ze_get_packet(sc, buf, len)
 	m = ze_ring_to_mbuf(sc, buf, m, len);
 	if (m == NULL) goto bad;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	/*
 	 * Check if there's a BPF listener on this interface.
 	 * If so, hand off the raw packet to bpf.
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 5de66e5..e62e41d 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.50 1999/03/08 21:21:43 steve Exp $
+ *	$Id: if_zp.c,v 1.51 1999/04/19 06:56:24 imp Exp $
  */
 /*-
  * TODO:
@@ -114,7 +114,7 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h";
 
 #include "zp.h"
 
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
@@ -145,7 +145,7 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h";
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -568,7 +568,7 @@ zpattach(isa_dev)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 #if NAPM > 0
@@ -761,7 +761,7 @@ startagain:
 	while (pad--)
 		outb(BASE + EP_W1_TX_PIO_WR_1, 0);	/* Padding */
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (sc->arpcom.ac_if.if_bpf) {
 		bpf_mtap(&sc->arpcom.ac_if, top);
 	}
@@ -975,7 +975,7 @@ zpread(sc)
 	outw(BASE + EP_COMMAND, RX_DISCARD_TOP_PACK);
 	while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS);
 	++sc->arpcom.ac_if.if_ipackets;
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (sc->arpcom.ac_if.if_bpf) {
 		bpf_mtap(&sc->arpcom.ac_if, top);