diff options
| author |   mpi <mpi@openbsd.org> | 2016-08-31 08:03:20 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-08-31 08:03:20 +0000 |
| commit | 49794fe790eafbe15853c484588d551bca7a11d1 (patch) | |
| tree | 38930b2a96b7ae33405580a7a252348204bc7375 | |
| parent | regen (diff) | |
| download | wireguard-openbsd-49794fe790eafbe15853c484588d551bca7a11d1.tar.xz wireguard-openbsd-49794fe790eafbe15853c484588d551bca7a11d1.zip | |
Drop gif(4) support, etherip(4) is what you want now.
ok sthen@, deraadt@, dlg@
| -rw-r--r-- | sys/net/if_bridge.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index de644d0beeb..1d929cc4ba4 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.280 2016/06/07 08:32:13 mpi Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.281 2016/08/31 08:03:20 mpi Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -88,10 +88,6 @@ #include <net/if_vlan_var.h> #endif -#if NGIF > 0 -#include <net/if_gif.h> -#endif - #include <net/if_bridge.h> /* @@ -342,11 +338,6 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } } -#if NGIF > 0 - else if (ifs->if_type == IFT_GIF) { - /* Nothing needed */ - } -#endif /* NGIF */ #if NMPW > 0 else if (ifs->if_type == IFT_MPLSTUNNEL) { /* Nothing needed */ @@ -1115,19 +1106,6 @@ bridge_process(struct ifnet *ifp, struct mbuf *m) if (mc == NULL) goto reenqueue; -#if NGIF > 0 - if (ifp->if_type == IFT_GIF) { - TAILQ_FOREACH(ifl, &sc->sc_iflist, next) { - if (ifl->ifp->if_type != IFT_ETHER) - continue; - - bridge_ifinput(ifl->ifp, mc); - break; - } - if (!ifl) - m_freem(mc); - } else -#endif /* NGIF */ bridge_ifinput(ifp, mc); bridgeintr_frame(sc, ifp, m); @@ -1872,19 +1850,6 @@ bridge_ifenqueue(struct bridge_softc *sc, struct ifnet *ifp, struct mbuf *m) /* Loop prevention. */ m->m_flags |= M_PROTO1; -#if NGIF > 0 - /* Packet needs etherip encapsulation. */ - if (ifp->if_type == IFT_GIF) { - - /* Count packets input into the gif from outside */ - ifp->if_ipackets++; - ifp->if_ibytes += m->m_pkthdr.len; - - error = gif_encap(ifp, &m, AF_LINK); - if (error) - return (error); - } -#endif /* NGIF */ len = m->m_pkthdr.len; error = if_enqueue(ifp, m); |