diff options
author | phk <phk@FreeBSD.org> | 1999-09-25 12:06:01 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-09-25 12:06:01 +0000 |
commit | d612df1de637eabac588385f0ef90f8d91a297de (patch) | |
tree | 98ecfb3ce51180cb27c6f26afbbda3e06f598865 /sys/i386/isa/if_zp.c | |
parent | 5f4944fbfdbe191d7f3f19a522957a406819ad3b (diff) | |
download | FreeBSD-src-d612df1de637eabac588385f0ef90f8d91a297de.zip FreeBSD-src-d612df1de637eabac588385f0ef90f8d91a297de.tar.gz |
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.
Diffstat (limited to 'sys/i386/isa/if_zp.c')
-rw-r--r-- | sys/i386/isa/if_zp.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index 3043517..4de0ea1 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -114,7 +114,6 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h"; #include "zp.h" -#include "bpf.h" #include "opt_inet.h" #include "opt_ipx.h" @@ -134,9 +133,7 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h"; #include <netinet/in.h> #include <netinet/if_ether.h> -#if NBPF > 0 #include <net/bpf.h> -#endif #include <machine/clock.h> #include <machine/md_var.h> @@ -557,9 +554,7 @@ zpattach(isa_dev) if_attach(ifp); ether_ifattach(ifp); -#if NBPF > 0 bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); -#endif #if NAPM > 0 sc->s_hook.ah_fun = zp_suspend; sc->s_hook.ah_arg = (void *) isa_dev; @@ -750,11 +745,9 @@ startagain: while (pad--) outb(BASE + EP_W1_TX_PIO_WR_1, 0); /* Padding */ -#if NBPF > 0 if (sc->arpcom.ac_if.if_bpf) { bpf_mtap(&sc->arpcom.ac_if, top); } -#endif m_freem(top); ++sc->arpcom.ac_if.if_opackets; @@ -964,7 +957,6 @@ zpread(sc) outw(BASE + EP_COMMAND, RX_DISCARD_TOP_PACK); while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS); ++sc->arpcom.ac_if.if_ipackets; -#if NBPF > 0 if (sc->arpcom.ac_if.if_bpf) { bpf_mtap(&sc->arpcom.ac_if, top); @@ -981,7 +973,6 @@ zpread(sc) return; } } -#endif m_adj(top, sizeof(struct ether_header)); ether_input(&sc->arpcom.ac_if, eh, top); return; |