3 files changed, 0 insertions, 32 deletions

diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index cb4b8d03b865..259d95c96de8 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -140,10 +140,7 @@
 #include <net/netisr.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include "bpf.h"
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 #endif /* INET */
 
 
@@ -944,9 +941,7 @@ lpattach (struct lpt_softc *sc, int unit)
 	if_attach(ifp);
 	printf("lp%d: TCP/IP capable interface\n", unit);
 
-#if NBPF > 0
 	bpfattach(ifp, DLT_NULL, LPIPHDRLEN);
-#endif
 }
 
 #ifndef PC98
@@ -1218,11 +1213,9 @@ lpintr (int unit)
 		IF_DROP(&ipintrq);
 		goto done;
 	    }
-#if NBPF > 0
 	    if (sc->sc_if.if_bpf) {
 		bpf_tap(&sc->sc_if, sc->sc_ifbuf, len);
 	    }
-#endif
 	    len -= LPIPHDRLEN;
 	    sc->sc_if.if_ipackets++;
 	    sc->sc_if.if_ibytes += len;
@@ -1410,7 +1403,6 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
     } else {
 	ifp->if_opackets++;
 	ifp->if_obytes += m->m_pkthdr.len;
-#if NBPF > 0
 	if (ifp->if_bpf) {
 	    /*
 	     * We need to prepend the packet type as
@@ -1428,7 +1420,6 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
 
 	    bpf_mtap(ifp, &m0);
 	}
-#endif
     }
 
     m_freem(m);
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index 2f8d4a29bcf7..a32134f18230 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -60,7 +60,6 @@
  */
 
 #include "ed.h"
-#include "bpf.h"
 #include "pnp.h"
 
 #ifndef EXTRA_ED
@@ -87,9 +86,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>
@@ -2465,9 +2462,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 1;
 }
 
@@ -2931,11 +2926,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);
 
@@ -3373,13 +3366,11 @@ 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
@@ -3504,13 +3495,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) {
@@ -3535,15 +3524,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.
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index cb4b8d03b865..259d95c96de8 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -140,10 +140,7 @@
 #include <net/netisr.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include "bpf.h"
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 #endif /* INET */
 
 
@@ -944,9 +941,7 @@ lpattach (struct lpt_softc *sc, int unit)
 	if_attach(ifp);
 	printf("lp%d: TCP/IP capable interface\n", unit);
 
-#if NBPF > 0
 	bpfattach(ifp, DLT_NULL, LPIPHDRLEN);
-#endif
 }
 
 #ifndef PC98
@@ -1218,11 +1213,9 @@ lpintr (int unit)
 		IF_DROP(&ipintrq);
 		goto done;
 	    }
-#if NBPF > 0
 	    if (sc->sc_if.if_bpf) {
 		bpf_tap(&sc->sc_if, sc->sc_ifbuf, len);
 	    }
-#endif
 	    len -= LPIPHDRLEN;
 	    sc->sc_if.if_ipackets++;
 	    sc->sc_if.if_ibytes += len;
@@ -1410,7 +1403,6 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
     } else {
 	ifp->if_opackets++;
 	ifp->if_obytes += m->m_pkthdr.len;
-#if NBPF > 0
 	if (ifp->if_bpf) {
 	    /*
 	     * We need to prepend the packet type as
@@ -1428,7 +1420,6 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
 
 	    bpf_mtap(ifp, &m0);
 	}
-#endif
     }
 
     m_freem(m);