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

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 95160ee..97d04d3 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -42,7 +42,6 @@
 #include <i386/isa/if_ed.c>	/* PCCARD version */
 #else
 
-#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,9 +65,7 @@
 #include <net/if_dl.h>
 #include <net/if_mib.h>
 
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 #include "opt_bdg.h"
 #ifdef BRIDGE
 #include <net/bridge.h>
@@ -1858,9 +1855,7 @@ ed_attach(sc, unit, flags)
 	/*
 	 * If BPF is in the kernel, call the attach for it
 	 */
-#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
-#endif
 	return (0);
 }
 
@@ -2337,11 +2332,9 @@ outloop:
 	/*
 	 * Tap off here if there is a bpf listener.
 	 */
-#if NBPF > 0
 	if (ifp->if_bpf) {
 		bpf_mtap(ifp, m0);
 	}
-#endif
 
 	m_freem(m0);
 
@@ -2773,13 +2766,10 @@ ed_ioctl(ifp, command, data)
 			}
 		}
 
-#if NBPF > 0
-
 		/*
 		 * Promiscuous flag may have changed, so reprogram the RCR.
 		 */
 		ed_setrcr(sc);
-#endif
 
 		/*
 		 * An unfortunate hack to provide the (required) software
@@ -2904,13 +2894,11 @@ ed_get_packet(sc, buf, len, multicast)
 		struct ifnet *ifp ;
 		int need_more = 1 ; /* in case not bpf */
 
-#if NBPF > 0
 		if (sc->arpcom.ac_if.if_bpf) {
 			need_more = 0 ;
 			ed_ring_copy(sc, buf, (char *)eh, len);
 			bpf_mtap(&sc->arpcom.ac_if, m);
 		} else
-#endif
 			ed_ring_copy(sc, buf, (char *)eh, 14);
 		ifp = bridge_in(m);
 		if (ifp == BDG_DROP) {
@@ -2935,15 +2923,12 @@ ed_get_packet(sc, buf, len, multicast)
 	 */
 	ed_ring_copy(sc, buf, (char *)eh, len);
 
-#if NBPF > 0
-
 	/*
 	 * Check if there's a BPF listener on this interface. If so, hand off
 	 * the raw packet to bpf.
 	 */
 	if (sc->arpcom.ac_if.if_bpf)
 		bpf_mtap(&sc->arpcom.ac_if, m);
-#endif
 	/*
 	 * If we are in promiscuous mode, we have to check whether
 	 * this packet is really for us.