Remove NBPF conditionality of bpf calls in most of our network drivers.

This means that we will not have to have a bpf and a non-bpf version
of our driver modules.

This does not open any security hole, because the bpf core isn't loadable

The drivers left unchanged are the "cross platform" drivers where the respective
maintainers are urged to DTRT, whatever that may be.

Add a couple of missing FreeBSD tags.

2 files changed, 0 insertions, 21 deletions

diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 60884ec..5883f88 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -60,10 +60,7 @@
 #include <net/netisr.h>
 #endif
 
-#include "bpf.h"
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 
 #ifdef INET
 #include <netinet/in.h>
@@ -3473,14 +3470,12 @@ tulip_rx_intr(
 #endif /* TULIP_BUS_DMA */
 
 	    eh = *mtod(ms, struct ether_header *);
-#if NBPF > 0
 	    if (sc->tulip_if.if_bpf != NULL) {
 		if (me == ms)
 		    bpf_tap(&sc->tulip_if, mtod(ms, caddr_t), total_len);
 		else
 		    bpf_mtap(&sc->tulip_if, ms);
 	    }
-#endif
 	    sc->tulip_flags |= TULIP_RXACT;
 
 #ifdef BRIDGE /* see code in if_ed.c */
@@ -3737,10 +3732,8 @@ tulip_tx_intr(
 		    TULIP_TXMAP_POSTSYNC(sc, map);
 		    sc->tulip_txmaps[sc->tulip_txmaps_free++] = map;
 #endif /* TULIP_BUS_DMA */
-#if NBPF > 0
 		    if (sc->tulip_if.if_bpf != NULL)
 			bpf_mtap(&sc->tulip_if, m);
-#endif
 		    m_freem(m);
 #if defined(TULIP_DEBUG)
 		} else {
@@ -4901,9 +4894,7 @@ tulip_attach(
     ifp->if_snd.ifq_maxlen = ifqmaxlen;
     ether_ifattach(&(sc)->tulip_if);
 
-#if NBPF > 0
     bpfattach(&sc->tulip_if, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 }
 
 #if defined(TULIP_BUS_DMA)
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index d2438e3..668e2c3 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -34,8 +34,6 @@
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
  */
 
-#include "bpf.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -52,9 +50,7 @@
 #include <netns/ns_if.h>
 #endif
 
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 
 #if defined(__NetBSD__)
 
@@ -419,10 +415,8 @@ fxp_attach(parent, self, aux)
 	 */
 	ifp->if_snd.ifq_maxlen = FXP_NTXCB - 1;
 	ether_ifattach(ifp, enaddr);
-#if NBPF > 0
 	bpfattach(&sc->sc_ethercom.ec_if.if_bpf, ifp, DLT_EN10MB,
 	    sizeof(struct ether_header));
-#endif
 
 	/*
 	 * Add shutdown hook so that DMA is disabled prior to reboot. Not
@@ -603,9 +597,7 @@ fxp_attach(device_t dev)
 	 */
 	ifp->if_snd.ifq_maxlen = FXP_NTXCB - 1;
 	ether_ifattach(ifp);
-#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 
 	splx(s);
 	return 0;
@@ -993,13 +985,11 @@ tbdinit:
 
 		sc->tx_queued++;
 
-#if NBPF > 0
 		/*
 		 * Pass packet to bpf if there is a listener.
 		 */
 		if (ifp->if_bpf)
 			bpf_mtap(FXP_BPFTAP_ARG(ifp), mb_head);
-#endif
 	}
 
 	/*
@@ -1102,12 +1092,10 @@ rcvloop:
 					m->m_pkthdr.len = m->m_len =
 					    total_len ;
 					eh = mtod(m, struct ether_header *);
-#if NBPF > 0
 					if (ifp->if_bpf)
 						bpf_tap(FXP_BPFTAP_ARG(ifp),
 						    mtod(m, caddr_t),
 						    total_len); 
-#endif /* NBPF > 0 */
 #ifdef BRIDGE
                                         if (do_bridge) {
                                             struct ifnet *bdg_ifp ;