Rename bpfilter to bpf.

27 files changed, 185 insertions, 185 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 556a4a1c48..6677153 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/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/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 556a4a1c48..6677153 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.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/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index f96f024..4863ffe 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/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/dev/de/if_de.c b/sys/dev/de/if_de.c
index f988a40..e032729 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $	*/
-/*	$Id: if_de.c,v 1.106 1999/05/10 14:12:26 peter Exp $ */
+/*	$Id: if_de.c,v 1.107 1999/07/03 20:17:02 peter Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -93,8 +93,8 @@
 #include <dev/mii/miivar.h>
 #endif
 
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -3536,7 +3536,7 @@ tulip_rx_intr(
 #endif /* TULIP_BUS_DMA */
 
 	    eh = *mtod(ms, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
 	    if (sc->tulip_bpf != NULL) {
 		if (me == ms)
 		    TULIP_BPF_TAP(sc, mtod(ms, caddr_t), total_len);
@@ -3807,7 +3807,7 @@ tulip_tx_intr(
 		    TULIP_TXMAP_POSTSYNC(sc, map);
 		    sc->tulip_txmaps[sc->tulip_txmaps_free++] = map;
 #endif /* TULIP_BUS_DMA */
-#if NBPFILTER > 0
+#if NBPF > 0
 		    if (sc->tulip_bpf != NULL)
 			TULIP_BPF_MTAP(sc, m);
 #endif
@@ -5112,7 +5112,7 @@ tulip_attach(
 #endif
 #endif /* __bsdi__ */
 
-#if NBPFILTER > 0
+#if NBPF > 0
     TULIP_BPF_ATTACH(sc);
 #endif
 
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h
index aa9ea3b..bb61346 100644
--- a/sys/dev/de/if_devar.h
+++ b/sys/dev/de/if_devar.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_devar.h,v 1.31 1998/09/29 22:40:52 matt Exp $	*/
-/*	$Id: if_devar.h,v 1.12 1998/11/06 02:13:14 peter Exp $ */
+/*	$Id: if_devar.h,v 1.13 1999/05/26 23:05:23 gallatin Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -961,7 +961,7 @@ static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
 #endif
 #if BSD >= 199506
 #define TULIP_IFP_TO_SOFTC(ifp) ((tulip_softc_t *)((ifp)->if_softc))
-#if NBPFILTER > 0
+#if NBPF > 0
 #define	TULIP_BPF_MTAP(sc, m)	bpf_mtap(&(sc)->tulip_if, m)
 #define	TULIP_BPF_TAP(sc, p, l)	bpf_tap(&(sc)->tulip_if, p, l)
 #define	TULIP_BPF_ATTACH(sc)	bpfattach(&(sc)->tulip_if, DLT_EN10MB, sizeof(struct ether_header))
@@ -1115,7 +1115,7 @@ extern struct cfdriver de_cd;
  * While I think FreeBSD's 2.2 change to the bpf is a nice simplification,
  * it does add yet more conditional code to this driver.  Sigh.
  */
-#if !defined(TULIP_BPF_MTAP) && NBPFILTER > 0
+#if !defined(TULIP_BPF_MTAP) && NBPF > 0
 #define	TULIP_BPF_MTAP(sc, m)	bpf_mtap((sc)->tulip_bpf, m)
 #define	TULIP_BPF_TAP(sc, p, l)	bpf_tap((sc)->tulip_bpf, p, l)
 #define	TULIP_BPF_ATTACH(sc)	bpfattach(&(sc)->tulip_bpf, &(sc)->tulip_if, DLT_EN10MB, sizeof(struct ether_header))
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 8775aa8..d65ac48 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/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/dev/en/midway.c b/sys/dev/en/midway.c
index a999ff5..662931a 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -169,8 +169,8 @@
 
 #endif	/* __FreeBSD__ */
 
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
 #include <net/bpf.h>
 #ifdef __FreeBSD__
 #define BPFATTACH(ifp, dlt, hlen)	bpfattach((ifp), (dlt), (hlen))
@@ -179,7 +179,7 @@
 #define BPFATTACH(ifp, dlt, hlen)	bpfattach(&(ifp)->if_bpf, (ifp), (dlt), (hlen))
 #define BPF_MTAP(ifp, m)		bpf_mtap((ifp)->if_bpf, (m))
 #endif
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 
 /*
  * params
@@ -820,7 +820,7 @@ done_probe:
   if_attach(ifp);
   atm_ifattach(ifp); 
 
-#if NBPFILTER > 0 
+#if NBPF > 0 
   BPFATTACH(ifp, DLT_ATM_RFC1483, sizeof(struct atmllc));
 #endif
 }
@@ -2120,7 +2120,7 @@ again:
 
   en_txlaunch(sc, chan, &launch);
 
-#if NBPFILTER > 0
+#if NBPF > 0
   if (ifp->if_bpf) {
       /*
        * adjust the top of the mbuf to skip the pseudo atm header
@@ -2139,7 +2139,7 @@ again:
       launch.t->m_data -= size;
       launch.t->m_len += size;
   }
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
   /*
    * do some housekeeping and get the next packet
    */
@@ -2709,7 +2709,7 @@ void *arg;
 	  ifp = &sc->enif;
 	  ifp->if_ipackets++;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	  if (ifp->if_bpf)
 	    BPF_MTAP(ifp, m);
 #endif
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 387184e..a332304 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/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/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 5411d30..8915af7 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/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/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 44678ce..21eccc2 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/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/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index b7e25e5..724668c 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -27,14 +27,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.68 1999/05/08 21:59:39 dfr Exp $
+ *	$Id: if_fxp.c,v 1.69 1999/05/09 10:45:54 peter Exp $
  */
 
 /*
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -419,7 +419,7 @@ fxp_attach(parent, self, aux)
 	 */
 	ifp->if_snd.ifq_maxlen = FXP_NTXCB - 1;
 	ether_ifattach(ifp, enaddr);
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(&sc->sc_ethercom.ec_if.if_bpf, ifp, DLT_EN10MB,
 	    sizeof(struct ether_header));
 #endif
@@ -598,7 +598,7 @@ fxp_attach(device_t dev)
 	 */
 	ifp->if_snd.ifq_maxlen = FXP_NTXCB - 1;
 	ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -988,7 +988,7 @@ tbdinit:
 
 		sc->tx_queued++;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * Pass packet to bpf if there is a listener.
 		 */
@@ -1097,12 +1097,12 @@ rcvloop:
 					m->m_pkthdr.len = m->m_len =
 					    total_len ;
 					eh = mtod(m, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
 					if (ifp->if_bpf)
 						bpf_tap(FXP_BPFTAP_ARG(ifp),
 						    mtod(m, caddr_t),
 						    total_len); 
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 #ifdef BRIDGE
                                         if (do_bridge) {
                                             struct ifnet *bdg_ifp ;
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 9c25836..a41b0b0 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/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/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index cfcd10d..58144d0 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ic.c,v 1.3 1998/12/07 21:58:16 archie Exp $
+ *	$Id: if_ic.c,v 1.4 1999/05/08 21:59:03 dfr Exp $
  */
 
 /*
@@ -59,9 +59,9 @@
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 
-#include "bpfilter.h"
+#include "bpf.h"
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -151,7 +151,7 @@ icattach(device_t dev)
 
 	if_attach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_NULL, ICHDRLEN);
 #endif
 
@@ -322,7 +322,7 @@ icintr (device_t dev, int event, char *ptr)
 	  sc->ic_if.if_ipackets ++;
 	  sc->ic_if.if_ibytes += len;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (sc->ic_if.if_bpf)
 		bpf_tap(&sc->ic_if, sc->ic_ifbuf, len + ICHDRLEN);
 #endif
@@ -417,7 +417,7 @@ icoutput(struct ifnet *ifp, struct mbuf *m,
 
 	} while ((mm = mm->m_next));
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (ifp->if_bpf) {
 		struct mbuf m0, *n = m;
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index f058661..5fc82330 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/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/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index 1075a3e..b2fc532 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.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/dev/pccard/if_xe.c b/sys/dev/pccard/if_xe.c
index f351e2c..60ee284 100644
--- a/sys/dev/pccard/if_xe.c
+++ b/sys/dev/pccard/if_xe.c
@@ -106,7 +106,7 @@
 #include "xe.h"
 #include "card.h"
 #include "apm.h"
-#include "bpfilter.h"
+#include "bpf.h"
 
 #if NXE > 0
 
@@ -131,9 +131,9 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_mib.h>
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
@@ -808,7 +808,7 @@ xe_attach (struct isa_device *dev) {
   if_attach(scp->ifp);
   ether_ifattach(scp->ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
   /* If BPF is in the kernel, call the attach for it */
 #if XE_DEBUG > 1
   printf("xe%d: BPF listener attached\n", scp->unit);
@@ -944,7 +944,7 @@ xe_start(struct ifnet *ifp) {
       return;
     }
 
-#if NBPFILTER > 0
+#if NBPF > 0
     /* Tap off here if there is a bpf listener */
     if (ifp->if_bpf) {
 #if XE_DEBUG > 1
@@ -952,7 +952,7 @@ xe_start(struct ifnet *ifp) {
 #endif
       bpf_mtap(ifp, mbp);
     }
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 
     ifp->if_timer = 5;			/* In case we don't hear from the card again */
     scp->tx_queued++;
@@ -1266,7 +1266,7 @@ xe_card_intr(struct pccard_devinfo *devi) {
 	  else
 	    insw(scp->dev->id_iobase+XE_EDP, ehp, len >> 1);
 
-#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.
@@ -1289,7 +1289,7 @@ xe_card_intr(struct pccard_devinfo *devi) {
 	      mbp = NULL;
 	    }
 	  }
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 
 	  if (mbp != NULL) {
 	    mbp->m_pkthdr.len = mbp->m_len = len - ETHER_HDR_LEN;
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 0a8106f..6bcb5c7 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.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: pdq_ifsubr.c,v 1.6 1998/01/08 23:40:28 eivind Exp $
+ * $Id: pdq_ifsubr.c,v 1.7 1998/02/20 13:11:45 bde Exp $
  *
  */
 
@@ -45,8 +45,8 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -186,7 +186,7 @@ pdq_os_receive_pdu(
     struct fddi_header *fh = mtod(m, struct fddi_header *);
 
     sc->sc_if.if_ipackets++;
-#if NBPFILTER > 0
+#if NBPF > 0
     if (sc->sc_bpf != NULL)
 	PDQ_BPF_MTAP(sc, m);
     if ((fh->fddi_fc & (FDDIFC_L|FDDIFC_F)) != FDDIFC_LLC_ASYNC) {
@@ -222,7 +222,7 @@ pdq_os_transmit_done(
     struct mbuf *m)
 {
     pdq_softc_t *sc = (pdq_softc_t *) pdq->pdq_os_ctx;
-#if NBPFILTER > 0
+#if NBPF > 0
     if (sc->sc_bpf != NULL)
 	PDQ_BPF_MTAP(sc, m);
 #endif
@@ -384,7 +384,7 @@ pdq_ifattach(
   
     if_attach(ifp);
     fddi_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
     PDQ_BPFATTACH(sc, DLT_FDDI, sizeof(struct fddi_header));
 #endif
 }
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index cfae33d..6d60a781 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: if_plip.c,v 1.11 1999/02/14 11:59:59 nsouch Exp $
+ *	$Id: if_plip.c,v 1.12 1999/02/14 16:19:16 nsouch Exp $
  */
 
 /*
@@ -93,8 +93,8 @@
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -256,7 +256,7 @@ lpattach (struct ppb_device *dev)
 	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
 	if_attach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_NULL, sizeof(u_int32_t));
 #endif
 
@@ -446,7 +446,7 @@ clpinbyte (int spin, struct ppb_device *dev)
 	return (ctrecvl[cl] | ctrecvh[c]);
 }
 
-#if NBPFILTER > 0
+#if NBPF > 0
 static void
 lptap(struct ifnet *ifp, struct mbuf *m)
 {
@@ -525,7 +525,7 @@ lpintr (int unit)
 	    sc->sc_if.if_ibytes += len;
 	    top = m_devget(sc->sc_ifbuf + CLPIPHDRLEN, len, 0, &sc->sc_if, 0);
 	    if (top) {
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (sc->sc_if.if_bpf)
 		    lptap(&sc->sc_if, top);
 #endif
@@ -578,7 +578,7 @@ lpintr (int unit)
 	    sc->sc_if.if_ibytes += len;
 	    top = m_devget(sc->sc_ifbuf + LPIPHDRLEN, len, 0, &sc->sc_if, 0);
 	    if (top) {
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (sc->sc_if.if_bpf)
 		    lptap(&sc->sc_if, top);
 #endif
@@ -715,7 +715,7 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
 	} else {
 		ifp->if_opackets++;
 		ifp->if_obytes += m->m_pkthdr.len;
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (ifp->if_bpf)
 		    lptap(ifp, m);
 #endif
@@ -762,7 +762,7 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
     } else {
 	ifp->if_opackets++;
 	ifp->if_obytes += m->m_pkthdr.len;
-#if NBPFILTER > 0
+#if NBPF > 0
 	if (ifp->if_bpf)
 	    lptap(ifp, m);
 #endif
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index c75a9a2..ba883f7 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/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/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index c75a9a2..ba883f7 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.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/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 99d8b7a..6810e23 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.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_ti.c,v 1.114 1999/07/05 19:20:31 wpaul Exp $
+ *	$Id: if_ti.c,v 1.8 1999/07/05 20:19:41 wpaul Exp $
  */
 
 /*
@@ -78,7 +78,7 @@
  * - Andrew Gallatin for providing FreeBSD/Alpha support.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 #include "vlan.h"
 
 #include <sys/param.h>
@@ -96,7 +96,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -128,7 +128,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.114 1999/07/05 19:20:31 wpaul Exp $";
+	"$Id: if_ti.c,v 1.8 1999/07/05 20:19:41 wpaul Exp $";
 #endif
 
 /*
@@ -1680,7 +1680,7 @@ ti_attach(config_id, unit)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -1785,7 +1785,7 @@ static void ti_rxeof(sc)
 		eh = mtod(m, struct ether_header *);
 		m->m_pkthdr.rcvif = ifp;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 	 	 * Handle BPF listeners. Let the BPF user see the packet, but
 	 	 * don't pass it up to the ether_input() layer unless it's
@@ -2070,7 +2070,7 @@ static void ti_start(ifp)
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
 		 */
-#if NBPFILTER > 0
+#if NBPF > 0
 		if (ifp->if_bpf)
 			bpf_mtap(ifp, m_head);
 #endif
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 0b0cec3..8899237 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.27 1999/05/10 00:20:46 peter Exp $ */
+/*	$Id: if_tx.c,v 1.28 1999/07/03 20:17:05 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -67,7 +67,7 @@
 	  } \
 	}
 
-#include "bpfilter.h"
+#include "bpf.h"
 #include "opt_bdg.h"
 
 #include <sys/param.h>
@@ -105,7 +105,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #endif
@@ -355,7 +355,7 @@ epic_openbsd_attach(
 	/* Attach os interface and bpf */
 	if_attach(ifp);
 	ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(&sc->sc_if.if_bpf, ifp, DLT_EN10MB,
 	    sizeof(struct ether_header));
 #endif
@@ -552,7 +552,7 @@ epic_freebsd_attach(
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp,DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -848,7 +848,7 @@ epic_ifstart(struct ifnet * const ifp){
 		/* Set watchdog timer */
 		ifp->if_timer = 8;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		if( ifp->if_bpf ) 
 #if defined(__FreeBSD__)
 			bpf_mtap( ifp, m0 );
@@ -918,15 +918,15 @@ epic_rx_done __P((
 		m->m_pkthdr.rcvif = &(sc->sc_if);
 		m->m_pkthdr.len = m->m_len = len;
 
-#if NBPFILTER > 0
-		/* Give mbuf to BPFILTER */
+#if NBPF > 0
+		/* Give mbuf to BPF */
 		if( sc->sc_if.if_bpf ) 
 #if defined(__FreeBSD__)
 			bpf_mtap( &sc->sc_if, m );
 #else /* __OpenBSD__ */
 			bpf_mtap( sc->sc_if.if_bpf, m );
 #endif /* __FreeBSD__ */
-#endif /* NBPFILTER */
+#endif /* NBPF */
 
 #ifdef BRIDGE
 		if (do_bridge) {
@@ -949,7 +949,7 @@ epic_rx_done __P((
 		}
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #ifdef BRIDGE
 		/*
 		 * This deserves explanation
@@ -959,7 +959,7 @@ epic_rx_done __P((
 		 * address of one of the other interfaces.
 		 *
 		 * But if the bridge is off, then we have to drop
-		 * stuff that came in just via bpfilter.
+		 * stuff that came in just via bpf.
 		 */
 		if (!do_bridge)
 #endif
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 1aca3f9..dfa293b 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.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_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $
+ *	$Id: if_vr.c,v 1.12 1999/07/02 04:17:15 peter Exp $
  */
 
 /*
@@ -59,7 +59,7 @@
  * transmission.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $";
+	"$Id: if_vr.c,v 1.12 1999/07/02 04:17:15 peter Exp $";
 #endif
 
 /*
@@ -1110,7 +1110,7 @@ vr_attach(config_id, unit)
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -1316,7 +1316,7 @@ static void vr_rxeof(sc)
 		eh = mtod(m, struct ether_header *);
 		m->m_pkthdr.rcvif = ifp;
 		m->m_pkthdr.len = m->m_len = total_len;
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * Handle BPF listeners. Let the BPF user see the packet, but
 		 * don't pass it up to the ether_input() layer unless it's
@@ -1621,7 +1621,7 @@ static void vr_start(ifp)
 		if (cur_tx != start_tx)
 			VR_TXOWN(cur_tx) = VR_TXSTAT_OWN;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index c401839..62cd9eb 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -27,7 +27,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_vx.c,v 1.19 1999/01/12 02:09:31 eivind Exp $
+ * $Id: if_vx.c,v 1.20 1999/01/27 20:09:20 dillon Exp $
  *
  */
 
@@ -62,7 +62,7 @@
 #define NVX 4
 #endif
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,7 +76,7 @@
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -216,7 +216,7 @@ vxattach(sc)
     if_attach(ifp);
     ether_ifattach(ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
     bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
 #endif
 
@@ -496,7 +496,7 @@ startagain:
     outw(BASE + VX_COMMAND, SET_TX_START_THRESH |
 	((len / 4 + sc->tx_start_thresh) >> 2));
 
-#if NBPFILTER > 0
+#if NBPF > 0
     if (sc->arpcom.ac_if.if_bpf) {
 	bpf_mtap(&sc->arpcom.ac_if, m0);
     }
@@ -745,7 +745,7 @@ again:
     /* We assume the header fit entirely in one mbuf. */
     eh = mtod(m, struct ether_header *);
 
-#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/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 5b1ba03c..4e2b2cf 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/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/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 3370477..9a4fbd7 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/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/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index f351e2c..60ee284 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -106,7 +106,7 @@
 #include "xe.h"
 #include "card.h"
 #include "apm.h"
-#include "bpfilter.h"
+#include "bpf.h"
 
 #if NXE > 0
 
@@ -131,9 +131,9 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_mib.h>
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
@@ -808,7 +808,7 @@ xe_attach (struct isa_device *dev) {
   if_attach(scp->ifp);
   ether_ifattach(scp->ifp);
 
-#if NBPFILTER > 0
+#if NBPF > 0
   /* If BPF is in the kernel, call the attach for it */
 #if XE_DEBUG > 1
   printf("xe%d: BPF listener attached\n", scp->unit);
@@ -944,7 +944,7 @@ xe_start(struct ifnet *ifp) {
       return;
     }
 
-#if NBPFILTER > 0
+#if NBPF > 0
     /* Tap off here if there is a bpf listener */
     if (ifp->if_bpf) {
 #if XE_DEBUG > 1
@@ -952,7 +952,7 @@ xe_start(struct ifnet *ifp) {
 #endif
       bpf_mtap(ifp, mbp);
     }
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 
     ifp->if_timer = 5;			/* In case we don't hear from the card again */
     scp->tx_queued++;
@@ -1266,7 +1266,7 @@ xe_card_intr(struct pccard_devinfo *devi) {
 	  else
 	    insw(scp->dev->id_iobase+XE_EDP, ehp, len >> 1);
 
-#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.
@@ -1289,7 +1289,7 @@ xe_card_intr(struct pccard_devinfo *devi) {
 	      mbp = NULL;
 	    }
 	  }
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
 
 	  if (mbp != NULL) {
 	    mbp->m_pkthdr.len = mbp->m_len = len - ETHER_HDR_LEN;