diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-09-25 12:06:01 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-09-25 12:06:01 +0000 |
| commit | 46783fb897761a099b5d9629afd30bb97cdeed5e (patch) | |
| tree | efd419464a05c5c9549c3ea5cc49e8d61c143e27 /sys/dev/wl | |
| parent | 40bc58df9a215b74d944ee58d146f6b2f3107568 (diff) | |
| download | src-46783fb897761a099b5d9629afd30bb97cdeed5e.tar.gz src-46783fb897761a099b5d9629afd30bb97cdeed5e.zip | |
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.
Notes
Notes:
svn path=/head/; revision=51646
Diffstat (limited to 'sys/dev/wl')
| -rw-r--r-- | sys/dev/wl/if_wl.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 2f6b6b754469..6111b8dfd437 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -190,7 +190,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "wl.h" #include "opt_wavelan.h" -#include "bpf.h" #include "opt_inet.h" #include <sys/param.h> @@ -215,9 +214,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <netinet/if_ether.h> #endif -#if NBPF > 0 #include <net/bpf.h> -#endif #include <machine/clock.h> @@ -511,9 +508,7 @@ wlattach(struct isa_device *id) if_attach(ifp); ether_ifattach(ifp); -#if NBPF > 0 bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); -#endif bcopy(&sc->wl_addr[0], sc->wl_ac.ac_enaddr, WAVELAN_ADDR_SIZE); printf("%s%d: address %6D, NWID 0x%02x%02x", ifp->if_name, ifp->if_unit, @@ -896,12 +891,10 @@ wlstart(struct ifnet *ifp) ifp = &(sc->wl_if); IF_DEQUEUE(&ifp->if_snd, m); if (m != (struct mbuf *)0) { -#if NBPF > 0 /* let BPF see it before we commit it */ if (ifp->if_bpf) { bpf_mtap(ifp, m); } -#endif sc->tbusy++; /* set the watchdog timer so that if the board * fails to interrupt we will restart @@ -1081,7 +1074,6 @@ wlread(int unit, u_short fd_p) m->m_pkthdr.len = clen; -#if NBPF > 0 /* * Check if there's a BPF listener on this interface. If so, hand off * the raw packet to bpf. @@ -1099,7 +1091,6 @@ wlread(int unit, u_short fd_p) bpf_mtap(ifp, &m0); } -#endif /* * If hw is in promiscuous mode (note that I said hardware, not if * IFF_PROMISC is set in ifnet flags), then if this is a unicast |