From d612df1de637eabac588385f0ef90f8d91a297de Mon Sep 17 00:00:00 2001 From: phk 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/net/if_vlan.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'sys/net/if_vlan.c') diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index dac28c8..bc0de3a 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -57,7 +57,6 @@ #include "vlan.h" #if NVLAN > 0 #include "opt_inet.h" -#include "bpf.h" #include #include @@ -69,9 +68,7 @@ #include #include -#if NBPF > 0 #include -#endif #include #include #include @@ -176,9 +173,7 @@ vlaninit(void *dummy) ifp->if_snd.ifq_maxlen = ifqmaxlen; if_attach(ifp); ether_ifattach(ifp); -#if NBPF > 0 bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); -#endif /* Now undo some of the damage... */ ifp->if_data.ifi_type = IFT_8021_VLAN; ifp->if_data.ifi_hdrlen = EVL_ENCAPLEN; @@ -209,10 +204,8 @@ vlan_start(struct ifnet *ifp) IF_DEQUEUE(&ifp->if_snd, m); if (m == 0) break; -#if NBPF > 0 if (ifp->if_bpf) bpf_mtap(ifp, m); -#endif /* NBPF > 0 */ /* * If the LINK0 flag is set, it means the underlying interface @@ -304,7 +297,6 @@ vlan_input_tag(struct ether_header *eh, struct mbuf *m, u_int16_t t) */ m->m_pkthdr.rcvif = &ifv->ifv_if; -#if NBPF > 0 if (ifv->ifv_if.if_bpf) { /* * Do the usual BPF fakery. Note that we don't support @@ -318,7 +310,6 @@ vlan_input_tag(struct ether_header *eh, struct mbuf *m, u_int16_t t) m0.m_data = (char *)eh; bpf_mtap(&ifv->ifv_if, &m0); } -#endif ifv->ifv_if.if_ipackets++; ether_input(&ifv->ifv_if, eh, m); return; @@ -356,7 +347,6 @@ vlan_input(struct ether_header *eh, struct mbuf *m) m->m_len -= EVL_ENCAPLEN; m->m_pkthdr.len -= EVL_ENCAPLEN; -#if NBPF > 0 if (ifv->ifv_if.if_bpf) { /* * Do the usual BPF fakery. Note that we don't support @@ -370,7 +360,6 @@ vlan_input(struct ether_header *eh, struct mbuf *m) m0.m_data = (char *)eh; bpf_mtap(&ifv->ifv_if, &m0); } -#endif ifv->ifv_if.if_ipackets++; ether_input(&ifv->ifv_if, eh, m); return 0; -- cgit v1.1