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/de | |
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/de')
-rw-r--r-- | sys/dev/de/if_de.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 60884ec2d0e1..5883f882b09f 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -60,10 +60,7 @@ #include <net/netisr.h> #endif -#include "bpf.h" -#if NBPF > 0 #include <net/bpf.h> -#endif #ifdef INET #include <netinet/in.h> @@ -3473,14 +3470,12 @@ tulip_rx_intr( #endif /* TULIP_BUS_DMA */ eh = *mtod(ms, struct ether_header *); -#if NBPF > 0 if (sc->tulip_if.if_bpf != NULL) { if (me == ms) bpf_tap(&sc->tulip_if, mtod(ms, caddr_t), total_len); else bpf_mtap(&sc->tulip_if, ms); } -#endif sc->tulip_flags |= TULIP_RXACT; #ifdef BRIDGE /* see code in if_ed.c */ @@ -3737,10 +3732,8 @@ tulip_tx_intr( TULIP_TXMAP_POSTSYNC(sc, map); sc->tulip_txmaps[sc->tulip_txmaps_free++] = map; #endif /* TULIP_BUS_DMA */ -#if NBPF > 0 if (sc->tulip_if.if_bpf != NULL) bpf_mtap(&sc->tulip_if, m); -#endif m_freem(m); #if defined(TULIP_DEBUG) } else { @@ -4901,9 +4894,7 @@ tulip_attach( ifp->if_snd.ifq_maxlen = ifqmaxlen; ether_ifattach(&(sc)->tulip_if); -#if NBPF > 0 bpfattach(&sc->tulip_if, DLT_EN10MB, sizeof(struct ether_header)); -#endif } #if defined(TULIP_BUS_DMA) |