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, 13 deletions

diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index d10f103..dd6cf3c8 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -64,7 +64,6 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
 
 #include "ze.h"
 #if	NZE > 0
-#include "bpf.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
@@ -81,9 +80,7 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 
 #include <machine/clock.h>
 #include <machine/md_var.h>
@@ -639,9 +636,7 @@ ze_attach(isa_dev)
 	/*
 	 * If BPF is in the kernel, call the attach for it
 	 */
-#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 
 #if NAPM > 0
 	sc->s_hook.ah_fun = ze_suspend;
@@ -860,14 +855,12 @@ 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 NBPF > 0
 	/*
 	 * Initialize multicast address hashing registers to accept
 	 *	 all multicasts (only used when in promiscuous mode)
 	 */
 	for (i = 0; i < 8; ++i)
 		outb(sc->nic_addr + ED_P1_MAR0 + i, 0xff);
-#endif
 
 	/*
 	 * Set Current Page pointer to next_packet (initialized above)
@@ -1031,11 +1024,9 @@ outloop:
 	/*
 	 * If there is BPF support in the configuration, tap off here.
 	 */
-#if NBPF > 0
 	if (ifp->if_bpf) {
 		bpf_mtap(ifp, m0);
 	}
-#endif
 
 	m_freem(m0);
 
@@ -1359,7 +1350,6 @@ ze_ioctl(ifp, command, data)
 		    	    ((ifp->if_flags & IFF_RUNNING) == 0))
 				ze_init(ifp->if_unit);
 		}
-#if NBPF > 0
 		if (ifp->if_flags & IFF_PROMISC) {
 			/*
 			 * Set promiscuous mode on interface.
@@ -1378,7 +1368,6 @@ ze_ioctl(ifp, command, data)
 			 */
 			outb(sc->nic_addr + ED_P0_RCR, ED_RCR_AB);
 		}
-#endif
 		break;
 
 	default:
@@ -1443,7 +1432,6 @@ ze_get_packet(sc, buf, len)
 	m = ze_ring_to_mbuf(sc, buf, m, len);
 	if (m == NULL) goto bad;
 
-#if NBPF > 0
 	/*
 	 * Check if there's a BPF listener on this interface.
 	 * If so, hand off the raw packet to bpf.
@@ -1468,7 +1456,6 @@ ze_get_packet(sc, buf, len)
 			return;
 		}
 	}
-#endif
 
 	/*
 	 * Fix up data start offset in mbuf to point past ether header