Rename bpfilter to bpf.

14 files changed, 99 insertions, 99 deletions

diff --git a/sys/pci/if_al.c b/sys/pci/if_al.c
index 64f7e17..ab299eb 100644
--- a/sys/pci/if_al.c
+++ b/sys/pci/if_al.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_al.c,v 1.4 1999/05/26 22:56:22 wpaul Exp $
+ *	$Id: if_al.c,v 1.5 1999/07/02 04:17:12 peter Exp $
  */
 
 /*
@@ -49,7 +49,7 @@
  * has physical address and multicast address registers.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -65,7 +65,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -90,7 +90,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_al.c,v 1.4 1999/05/26 22:56:22 wpaul Exp $";
+	"$Id: if_al.c,v 1.5 1999/07/02 04:17:12 peter Exp $";
 #endif
 
 /*
@@ -1066,7 +1066,7 @@ al_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
 	at_shutdown(al_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1300,7 +1300,7 @@ static void al_rxeof(sc)
 
 		ifp->if_ipackets++;
 		eh = mtod(m, struct ether_header *);
-#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
@@ -1625,7 +1625,7 @@ static void al_start(ifp)
 		/* Pack the data into the descriptor. */
 		al_encap(sc, cur_tx, m_head);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index 413ab2c..7a80ea3 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.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_ax.c,v 1.9 1999/05/09 17:06:48 peter Exp $
+ *	$Id: if_ax.c,v 1.10 1999/07/02 04:17:12 peter Exp $
  */
 
 /*
@@ -49,7 +49,7 @@
  * the registers.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -65,7 +65,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -87,7 +87,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_ax.c,v 1.9 1999/05/09 17:06:48 peter Exp $";
+	"$Id: if_ax.c,v 1.10 1999/07/02 04:17:12 peter Exp $";
 #endif
 
 /*
@@ -1308,7 +1308,7 @@ ax_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
 	at_shutdown(ax_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1542,7 +1542,7 @@ static void ax_rxeof(sc)
 
 		ifp->if_ipackets++;
 		eh = mtod(m, struct ether_header *);
-#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
@@ -1866,7 +1866,7 @@ static void ax_start(ifp)
 		if (cur_tx != start_tx)
 			AX_TXOWN(cur_tx) = AX_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/pci/if_de.c b/sys/pci/if_de.c
index f988a40..e032729 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/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/pci/if_devar.h b/sys/pci/if_devar.h
index aa9ea3b..bb61346 100644
--- a/sys/pci/if_devar.h
+++ b/sys/pci/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/pci/if_fxp.c b/sys/pci/if_fxp.c
index b7e25e5..724668c 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/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/pci/if_mx.c b/sys/pci/if_mx.c
index e05448d..ce9338b 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.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_mx.c,v 1.19 1999/06/16 16:27:30 wpaul Exp $
+ *	$Id: if_mx.c,v 1.20 1999/07/02 04:17:13 peter Exp $
  */
 
 /*
@@ -56,7 +56,7 @@
  * the NWAY support.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,7 +72,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -94,7 +94,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.19 1999/06/16 16:27:30 wpaul Exp $";
+	"$Id: if_mx.c,v 1.20 1999/07/02 04:17:13 peter Exp $";
 #endif
 
 /*
@@ -1563,7 +1563,7 @@ mx_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
 	at_shutdown(mx_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1777,7 +1777,7 @@ static void mx_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
@@ -2118,7 +2118,7 @@ static void mx_start(ifp)
 		if (cur_tx != start_tx)
 			MX_TXOWN(cur_tx) = MX_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/pci/if_pn.c b/sys/pci/if_pn.c
index 1aea367..a237524e 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.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_pn.c,v 1.21 1999/05/28 18:43:10 wpaul Exp $
+ *	$Id: if_pn.c,v 1.22 1999/07/02 04:17:13 peter Exp $
  */
 
 /*
@@ -57,7 +57,7 @@
  * 100BaseTX PHY.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,7 +73,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_pn.c,v 1.21 1999/05/28 18:43:10 wpaul Exp $";
+	"$Id: if_pn.c,v 1.22 1999/07/02 04:17:13 peter Exp $";
 #endif
 
 
@@ -1211,7 +1211,7 @@ pn_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
 	at_shutdown(pn_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1569,7 +1569,7 @@ static void pn_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
@@ -1900,7 +1900,7 @@ static void pn_start(ifp)
 		if (cur_tx != start_tx)
 			PN_TXOWN(cur_tx) = PN_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/pci/if_rl.c b/sys/pci/if_rl.c
index 4a2035a..cd28d28 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.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_rl.c,v 1.17 1999/06/19 20:17:37 wpaul Exp $
+ *	$Id: if_rl.c,v 1.18 1999/07/02 04:17:14 peter Exp $
  */
 
 /*
@@ -83,7 +83,7 @@
  * to select which interface to use depending on the chip type.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,7 +99,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -127,7 +127,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.17 1999/06/19 20:17:37 wpaul Exp $";
+	"$Id: if_rl.c,v 1.18 1999/07/02 04:17:14 peter Exp $";
 #endif
 
 /*
@@ -1234,7 +1234,7 @@ rl_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
 	at_shutdown(rl_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1417,7 +1417,7 @@ static void rl_rxeof(sc)
 		eh = mtod(m, struct ether_header *);
 		ifp->if_ipackets++;
 
-#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
@@ -1614,7 +1614,7 @@ static void rl_start(ifp)
 
 		rl_encap(sc, m_head);
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 99d8b7a..6810e23 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/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/pci/if_tl.c b/sys/pci/if_tl.c
index 322ecf4..dbaf922 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.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_tl.c,v 1.32 1999/05/09 17:07:01 peter Exp $
+ *	$Id: if_tl.c,v 1.33 1999/07/02 04:17:15 peter Exp $
  */
 
 /*
@@ -178,7 +178,7 @@
  * itself thereby reducing the load on the host CPU.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -194,7 +194,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -221,7 +221,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.32 1999/05/09 17:07:01 peter Exp $";
+	"$Id: if_tl.c,v 1.33 1999/07/02 04:17:15 peter Exp $";
 #endif
 
 /*
@@ -1786,7 +1786,7 @@ tl_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
 
@@ -1966,7 +1966,7 @@ static int tl_intvec_rxeof(xsc, type)
 				continue;
 		}
 
-#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
@@ -2434,7 +2434,7 @@ static void tl_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, cur_tx->tl_mbuf);
 #endif
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index 0b0cec3..8899237 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/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/pci/if_vr.c b/sys/pci/if_vr.c
index 1aca3f9..dfa293b 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/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/pci/if_wb.c b/sys/pci/if_wb.c
index 5d51c3c..371ade7 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.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_wb.c,v 1.10 1999/05/13 20:36:00 wpaul Exp $
+ *	$Id: if_wb.c,v 1.11 1999/07/02 04:17:16 peter Exp $
  */
 
 /*
@@ -83,7 +83,7 @@
  * three of my test boards seems fine.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,7 +99,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -121,7 +121,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_wb.c,v 1.10 1999/05/13 20:36:00 wpaul Exp $";
+	"$Id: if_wb.c,v 1.11 1999/07/02 04:17:16 peter Exp $";
 #endif
 
 /*
@@ -1228,7 +1228,7 @@ wb_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
 	at_shutdown(wb_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1423,7 +1423,7 @@ static void wb_rxeof(sc)
 		ifp->if_ipackets++;
 		eh = mtod(m, struct ether_header *);
 
-#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
@@ -1772,7 +1772,7 @@ static void wb_start(ifp)
 		if (cur_tx != start_tx)
 			WB_TXOWN(cur_tx) = WB_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/pci/if_xl.c b/sys/pci/if_xl.c
index 4dcdbc4..e334e43 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.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_xl.c,v 1.40 1999/06/01 19:04:23 wpaul Exp $
+ *	$Id: if_xl.c,v 1.41 1999/07/02 04:17:16 peter Exp $
  */
 
 /*
@@ -89,7 +89,7 @@
  * PCI-based NICs.
  */
 
-#include "bpfilter.h"
+#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,7 +105,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#if NBPFILTER > 0
+#if NBPF > 0
 #include <net/bpf.h>
 #endif
 
@@ -160,7 +160,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.40 1999/06/01 19:04:23 wpaul Exp $";
+	"$Id: if_xl.c,v 1.41 1999/07/02 04:17:16 peter Exp $";
 #endif
 
 /*
@@ -1791,7 +1791,7 @@ xl_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
 	at_shutdown(xl_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1967,7 +1967,7 @@ again:
 		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. */
 		if (ifp->if_bpf)
 			bpf_mtap(ifp, m);
@@ -1987,7 +1987,7 @@ again:
 		}
 #endif
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * Don't pass packet up to the ether_input() layer unless it's
 		 * a broadcast packet, multicast packet, matches our ethernet
@@ -2381,7 +2381,7 @@ static void xl_start(ifp)
 		}
 		prev = cur_tx;
 
-#if NBPFILTER > 0
+#if NBPF > 0
 		/*
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.