From 46783fb897761a099b5d9629afd30bb97cdeed5e Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 25 Sep 1999 12:06:01 +0000
Subject: 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.
---
 sys/dev/cs/if_cs.c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'sys/dev/cs/if_cs.c')

diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 0f11d1468e7f..29f91b99cd2f 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -35,7 +35,6 @@
 
 /* #define	 CS_DEBUG */
 #include "cs.h"
-#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,9 +51,7 @@
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 
 #include <machine/clock.h>
 
@@ -621,9 +618,7 @@ cs_attach(struct cs_softc *sc, int unit, int flags)
 		printf(CS_NAME"%d: ethernet address %6D\n",
 		       ifp->if_unit, sc->arpcom.ac_enaddr, ":");
 
-#if NBPF > 0
 	bpfattach(ifp, DLT_EN10MB, sizeof (struct ether_header));
-#endif
 	return 1;
 }
 
@@ -778,10 +773,8 @@ cs_get_packet(struct cs_softc *sc)
 
 	eh = mtod(m, struct ether_header *);
 
-#if NBPF > 0
 	if (ifp->if_bpf)
 		bpf_mtap(ifp, m);
-#endif
 
 #ifdef CS_DEBUG
 	for (i=0;i<length;i++)
@@ -951,11 +944,9 @@ cs_start(struct ifnet *ifp)
 
 			cs_write_mbufs(sc, m);
 
-#if NBPF > 0
 			if (ifp->if_bpf) {
 				bpf_mtap(ifp, m);
 			}
-#endif
 
 			m_freem(m);
 		}
-- 
cgit v1.3