diff options
| author |   dlg <dlg@openbsd.org> | 2018-02-22 09:47:12 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2018-02-22 09:47:12 +0000 |
| commit | 4f7f6dbd11825b9c2e5844421d1ce7811b672283 (patch) | |
| tree | f828fabd4519a22f129db9306876d9a454898deb | |
| parent | Always reallocate a new memory chunk when changing the gateway of a (diff) | |
| download | wireguard-openbsd-4f7f6dbd11825b9c2e5844421d1ce7811b672283.tar.xz wireguard-openbsd-4f7f6dbd11825b9c2e5844421d1ce7811b672283.zip | |
remove some debug code in nvgre
| -rw-r--r-- | sys/net/if_gre.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 2e33fc012c1..91fbbf32d0e 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.111 2018/02/22 07:33:24 dlg Exp $ */ +/* $OpenBSD: if_gre.c,v 1.112 2018/02/22 09:47:12 dlg Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -356,8 +356,6 @@ struct nvgre_softc { unsigned int sc_ether_max; int sc_ether_tmo; struct timeout sc_ether_age; - - caddr_t sc_if_bpf; }; RBT_HEAD(nvgre_ucast_tree, nvgre_softc); @@ -598,10 +596,6 @@ nvgre_clone_create(struct if_clone *ifc, int unit) if_attach(ifp); ether_ifattach(ifp); -#if NBPFILTER > 0 - bpfattach(&sc->sc_if_bpf, ifp, DLT_LOOP, sizeof(uint32_t)); -#endif - return (0); } @@ -1145,14 +1139,6 @@ nvgre_input(const struct gre_tunnel *key, struct mbuf *m, int hlen) if (sc == NULL) return (-1); -#if NBPFILTER > 0 - { - caddr_t if_bpf = sc->sc_if_bpf; - if (if_bpf) - bpf_mtap_af(if_bpf, key->t_af, m, BPF_DIRECTION_IN); - } -#endif - /* it's ours now */ m = gre_ether_align(m, hlen); if (m == NULL) @@ -2699,12 +2685,6 @@ nvgre_start(struct ifnet *ifp) if (m == NULL) continue; -#if NBPFILTER > 0 - if_bpf = sc->sc_if_bpf; - if (if_bpf) - bpf_mtap_af(if_bpf, tunnel->t_af, m, BPF_DIRECTION_OUT); -#endif - m->m_flags &= ~(M_BCAST|M_MCAST); m->m_pkthdr.ph_rtableid = tunnel->t_rtableid; |