diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2017-11-17 14:51:14 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2017-11-17 14:51:14 +0000 |
| commit | f169dac002e09012b7d98d7769172a50d63120f7 (patch) | |
| tree | 84baf32eae9da9f2fdfbb18fd14169ed0d900f9d /sys/netinet6/in6_proto.c | |
| parent | f76e2156b843b596a70827a2f98f693913597437 (diff) | |
Drop all Ethernet-in-IP support from gif(4)
As a result, ip_ether.c now only deals with MPLS-in-IP. The next
commits will move & rename stuff to make this clear. ok visa@ mpi@
Diffstat (limited to 'sys/netinet6/in6_proto.c')
| -rw-r--r-- | sys/netinet6/in6_proto.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 65fef212390..85636b907d2 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.98 2017/11/15 16:50:31 jca Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.99 2017/11/17 14:51:13 jca Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -272,19 +272,6 @@ struct protosw inet6sw[] = { .pr_attach = rip6_attach, .pr_detach = rip6_detach, }, -#if NGIF > 0 -{ - .pr_type = SOCK_RAW, - .pr_domain = &inet6domain, - .pr_protocol = IPPROTO_ETHERIP, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = etherip_input, - .pr_ctloutput = rip6_ctloutput, - .pr_usrreq = rip6_usrreq, - .pr_attach = rip6_attach, - .pr_detach = rip6_detach, -}, -#endif /* NGIF */ #if NCARP > 0 { .pr_type = SOCK_RAW, |