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.

1 files changed, 0 insertions, 9 deletions

diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index f0be0d4..0cf8083 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -106,7 +106,6 @@
 #include "xe.h"
 #include "card.h"
 #include "apm.h"
-#include "bpf.h"
 
 #if NXE > 0
 
@@ -131,9 +130,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_mib.h>
-#if NBPF > 0
 #include <net/bpf.h>
-#endif /* NBPF > 0 */
 
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
@@ -808,13 +805,11 @@ xe_attach (struct isa_device *dev) {
   if_attach(scp->ifp);
   ether_ifattach(scp->ifp);
 
-#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);
 #endif
   bpfattach(scp->ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 
   /* Done */
   return 1;
@@ -944,7 +939,6 @@ xe_start(struct ifnet *ifp) {
       return;
     }
 
-#if NBPF > 0
     /* Tap off here if there is a bpf listener */
     if (ifp->if_bpf) {
 #if XE_DEBUG > 1
@@ -952,7 +946,6 @@ xe_start(struct ifnet *ifp) {
 #endif
       bpf_mtap(ifp, mbp);
     }
-#endif /* NBPF > 0 */
 
     ifp->if_timer = 5;			/* In case we don't hear from the card again */
     scp->tx_queued++;
@@ -1266,7 +1259,6 @@ xe_card_intr(struct pccard_devinfo *devi) {
 	  else
 	    insw(scp->dev->id_iobase+XE_EDP, ehp, len >> 1);
 
-#if NBPF > 0
 	  /*
 	   * Check if there's a BPF listener on this interface. If so, hand
 	   * off the raw packet to bpf.
@@ -1289,7 +1281,6 @@ xe_card_intr(struct pccard_devinfo *devi) {
 	      mbp = NULL;
 	    }
 	  }
-#endif /* NBPF > 0 */
 
 	  if (mbp != NULL) {
 	    mbp->m_pkthdr.len = mbp->m_len = len - ETHER_HDR_LEN;