diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2017-11-17 14:50:18 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2017-11-17 14:50:18 +0000 |
| commit | f76e2156b843b596a70827a2f98f693913597437 (patch) | |
| tree | aceee83f691bf4d27b6a109e8f9f685e40707dd9 /sys | |
| parent | 24762cd6b9d0647aa312f5d610c5c0e5d5f53117 (diff) | |
Don't pass unhandled packets to gif(4)
This was useful for the migration path, it's not since gif(4) can't be
added to a bridge any more. ok visa@ as part of a larger diff, ok mpi@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_etherip.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sys/net/if_etherip.c b/sys/net/if_etherip.c index 051a8692faa..5e2b1cfe069 100644 --- a/sys/net/if_etherip.c +++ b/sys/net/if_etherip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_etherip.c,v 1.24 2017/11/17 13:36:04 jca Exp $ */ +/* $OpenBSD: if_etherip.c,v 1.25 2017/11/17 14:50:17 jca Exp $ */ /* * Copyright (c) 2015 Kazuya GODA <goda@openbsd.org> * @@ -17,7 +17,6 @@ #include "bpfilter.h" #include "pf.h" -#include "gif.h" #include <sys/param.h> #include <sys/systm.h> @@ -452,18 +451,9 @@ ip_etherip_input(struct mbuf **mp, int *offp, int proto, int af) } if (ifp == NULL) { -#if NGIF > 0 - /* - * This path is nessesary for gif(4) and etherip(4) coexistence. - * This is tricky but the path will be removed soon when - * implementation of etherip is removed from gif(4). - */ - return etherip_input(mp, offp, proto, af); -#else etheripstat_inc(etherips_noifdrops); m_freem(m); return IPPROTO_DONE; -#endif /* NGIF */ } m_adj(m, *offp); @@ -614,18 +604,9 @@ ip6_etherip_input(struct mbuf **mp, int *offp, int proto, int af) } if (ifp == NULL) { -#if NGIF > 0 - /* - * This path is nessesary for gif(4) and etherip(4) coexistence. - * This is tricky but the path will be removed soon when - * implementation of etherip is removed from gif(4). - */ - return etherip_input(mp, offp, proto, af); -#else etheripstat_inc(etherips_noifdrops); m_freem(m); return IPPROTO_DONE; -#endif /* NGIF */ } m_adj(m, *offp); |