6.0 is out, that means etherip(4) has been around for more than two
releases, times to remove gif(4) support from bridge?
ok?
Index: net/if_bridge.c
===================================================================
RCS file: /cvs/src/sys/net/if_bridge.c,v
retrieving revision 1.280
diff -u -p -r1.280 if_bridge.c
--- net/if_bridge.c 7 Jun 2016 08:32:13 -0000 1.280
+++ net/if_bridge.c 30 Aug 2016 08:59:52 -0000
@@ -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 c
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
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
/* 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);
