From d612df1de637eabac588385f0ef90f8d91a297de Mon Sep 17 00:00:00 2001
From: phk <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/ar/if_ar.c     | 9 ---------
 sys/dev/ar/if_ar_isa.c | 9 ---------
 2 files changed, 18 deletions(-)

(limited to 'sys/dev/ar')

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 342cba4..8a62e3c 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -49,7 +49,6 @@
  */
 
 #include "ar.h"
-#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,9 +60,7 @@
 #include <net/if.h>
 #include <net/if_sppp.h>
 
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 
 #include <machine/clock.h>
 #include <machine/md_var.h>
@@ -357,9 +354,7 @@ arattach(struct isa_device *id)
 		sppp_attach((struct ifnet *)&sc->ifsppp);
 		if_attach(ifp);
 
-#if NBPF > 0
 		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
-#endif
 	}
 
 	ARC_SET_OFF(hc->iobase);
@@ -537,10 +532,8 @@ top_arstart:
 		txdata += AR_BUF_SIZ;
 		i++;
 
-#if NBPF > 0
 		if(ifp->if_bpf)
 			bpf_mtap(ifp, mtx);
-#endif
 		m_freem(mtx);
 		++sc->ifsppp.pp_if.if_opackets;
 
@@ -1299,10 +1292,8 @@ ar_get_packets(struct ar_softc *sc)
 				}
 			}
 			ar_copy_rxbuf(m, sc, len);
-#if NBPF > 0
 			if(sc->ifsppp.pp_if.if_bpf)
 				bpf_mtap(&sc->ifsppp.pp_if, m);
-#endif
 			sppp_input(&sc->ifsppp.pp_if, m);
 			sc->ifsppp.pp_if.if_ipackets++;
 
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 342cba4..8a62e3c 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -49,7 +49,6 @@
  */
 
 #include "ar.h"
-#include "bpf.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,9 +60,7 @@
 #include <net/if.h>
 #include <net/if_sppp.h>
 
-#if NBPF > 0
 #include <net/bpf.h>
-#endif
 
 #include <machine/clock.h>
 #include <machine/md_var.h>
@@ -357,9 +354,7 @@ arattach(struct isa_device *id)
 		sppp_attach((struct ifnet *)&sc->ifsppp);
 		if_attach(ifp);
 
-#if NBPF > 0
 		bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
-#endif
 	}
 
 	ARC_SET_OFF(hc->iobase);
@@ -537,10 +532,8 @@ top_arstart:
 		txdata += AR_BUF_SIZ;
 		i++;
 
-#if NBPF > 0
 		if(ifp->if_bpf)
 			bpf_mtap(ifp, mtx);
-#endif
 		m_freem(mtx);
 		++sc->ifsppp.pp_if.if_opackets;
 
@@ -1299,10 +1292,8 @@ ar_get_packets(struct ar_softc *sc)
 				}
 			}
 			ar_copy_rxbuf(m, sc, len);
-#if NBPF > 0
 			if(sc->ifsppp.pp_if.if_bpf)
 				bpf_mtap(&sc->ifsppp.pp_if, m);
-#endif
 			sppp_input(&sc->ifsppp.pp_if, m);
 			sc->ifsppp.pp_if.if_ipackets++;
 
-- 
cgit v1.1