Retire EtherIP, we have L2TP instead.

distrib/sets/lists/comp/mi

@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2218 2018/08/13 08:26:49 christos Exp $
+#	$NetBSD: mi,v 1.2219 2018/08/14 14:49:13 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -2299,7 +2299,7 @@
 ./usr/include/net/if_bridgevar.h		comp-c-include
 ./usr/include/net/if_dl.h			comp-c-include
 ./usr/include/net/if_ether.h			comp-c-include
-./usr/include/net/if_etherip.h			comp-c-include
+./usr/include/net/if_etherip.h			comp-obsolete		obsolete
 ./usr/include/net/if_fddi.h			comp-c-include
 ./usr/include/net/if_gif.h			comp-c-include
 ./usr/include/net/if_gre.h			comp-c-include

distrib/sets/lists/man/mi

@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1608 2018/08/12 17:11:55 christos Exp $
+# $NetBSD: mi,v 1.1609 2018/08/14 14:49:13 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1071,7 +1071,7 @@
 ./usr/share/man/cat4/esp.0			man-sys-catman		.cat
 ./usr/share/man/cat4/ess.0			man-sys-catman		.cat
 ./usr/share/man/cat4/et.0			man-sys-catman		.cat
-./usr/share/man/cat4/etherip.0			man-sys-catman		.cat
+./usr/share/man/cat4/etherip.0			man-obsolete		obsolete
 ./usr/share/man/cat4/etphy.0			man-sys-catman		.cat
 ./usr/share/man/cat4/evbarm/bcmgpio.0		man-sys-catman		.cat
 ./usr/share/man/cat4/evbarm/cpsw.0		man-sys-catman		.cat
@@ -4221,7 +4221,7 @@
 ./usr/share/man/html4/esp.html			man-sys-htmlman		html
 ./usr/share/man/html4/ess.html			man-sys-htmlman		html
 ./usr/share/man/html4/et.html			man-sys-htmlman		html
-./usr/share/man/html4/etherip.html		man-sys-htmlman		html
+./usr/share/man/html4/etherip.html		man-obsolete		obsolete
 ./usr/share/man/html4/etphy.html		man-sys-htmlman		html
 ./usr/share/man/html4/evbarm/bcmgpio.html	man-sys-htmlman		html
 ./usr/share/man/html4/evbarm/cpsw.html		man-sys-htmlman		html
@@ -7143,7 +7143,7 @@
 ./usr/share/man/man4/esp.4			man-sys-man		.man
 ./usr/share/man/man4/ess.4			man-sys-man		.man
 ./usr/share/man/man4/et.4			man-sys-man		.man
-./usr/share/man/man4/etherip.4			man-sys-man		.man
+./usr/share/man/man4/etherip.4			man-obsolete		obsolete
 ./usr/share/man/man4/etphy.4			man-sys-man		.man
 ./usr/share/man/man4/evbarm/bcmgpio.4		man-sys-man		.man
 ./usr/share/man/man4/evbarm/cpsw.4		man-sys-man		.man

doc/TODO.smpnet

@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.22 2018/08/07 07:19:28 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.23 2018/08/14 14:49:13 maxv Exp $
 
 MP-safe components
 ==================
@@ -75,7 +75,6 @@ Unprotected ones
  - Interfaces
    - agr(4)
    - carp(4)
-   - etherip(4)
    - faith(4)
    - gre(4)
    - ppp(4)

share/man/man4/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.663 2018/08/08 21:15:41 maya Exp $
+#	$NetBSD: Makefile,v 1.664 2018/08/14 14:49:13 maxv Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -22,7 +22,7 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
 	ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \
 	dmphy.4 dpt.4 dpti.4 drm.4 drum.4 drvctl.4 dtv.4 dtviic.4 dwctwo.4 \
 	eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 \
-	esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \
+	esa.4 esiop.4 esm.4 eso.4 et.4 etphy.4 exphy.4 \
 	fd.4 filemon.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 \
 	fujbp.4 full.4 fxp.4 \
 	gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \

sys/conf/files

@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1202 2018/07/15 07:07:15 martin Exp $
+#	$NetBSD: files,v 1.1203 2018/08/14 14:49:13 maxv Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -1456,7 +1456,6 @@ defpseudo srt:		ifnet
 defpseudo stf:		ifnet
 defpseudodev tap:	ifnet, ether, arp
 defpseudo carp:		ifnet, ether, arp
-defpseudodev etherip:	ifnet, ether, arp
 defpseudodev l2tp:	ifnet, ether, arp
 defpseudo canloop:	ifnet
 defpseudo ipsecif:	ifnet		# avoid to confuse ipsec itself option

sys/net/Makefile

@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.36 2018/02/16 10:19:04 knakahara Exp $
+#	$NetBSD: Makefile,v 1.37 2018/08/14 14:49:13 maxv Exp $
 
 INCSDIR= /usr/include/net
 
 INCS=	bpf.h bpfjit.h bpfdesc.h dlt.h ethertypes.h if.h if_arc.h if_arp.h \
-	if_atm.h if_bridgevar.h if_dl.h if_ether.h if_etherip.h if_fddi.h if_gif.h \
+	if_atm.h if_bridgevar.h if_dl.h if_ether.h if_fddi.h if_gif.h \
 	if_gre.h if_hippi.h if_ieee1394.h if_ipsec.h if_llc.h if_media.h if_mpls.h \
 	if_pflog.h if_ppp.h if_pppoe.h if_l2tp.h if_sppp.h if_srt.h if_stf.h \
 	if_tap.h if_token.h if_tun.h if_types.h if_vlanvar.h net_stats.h \

sys/net/files.net

@@ -1,4 +1,4 @@
-#	$NetBSD: files.net,v 1.16 2018/02/27 14:28:01 maxv Exp $
+#	$NetBSD: files.net,v 1.17 2018/08/14 14:49:13 maxv Exp $
 
 # XXX CLEANUP
 define	net
@@ -12,7 +12,6 @@ file	net/if_arcsubr.c		arcnet			needs-flag
 file	net/if_atmsubr.c		atm
 file	net/if_bridge.c			bridge			needs-flag
 file	net/bridgestp.c			bridge
-file	net/if_etherip.c		etherip			needs-flag
 file	net/if_ethersubr.c		ether | fddi | netatalk | token |
 					    wlan		needs-flag
 file	net/if_faith.c			faith & (inet | inet6)	needs-flag
@@ -64,9 +63,7 @@ file	netinet/in_l2tp.c		l2tp & inet
 file	netinet/ip_carp.c		carp & (inet | inet6)	needs-flag
 file	netinet/ip_ecn.c		ipsec | gif | stf
 file	netinet/ip_encap.c		inet | inet6
-file	netinet/ip_etherip.c		etherip & inet
 file	netinet/wqinput.c		inet | inet6
-file	netinet6/ip6_etherip.c		etherip & inet6
 file	netinet6/in6_gif.c		gif & inet6
 file	netinet6/in6_l2tp.c		l2tp & inet6