Module Name: src
Committed By: maxv
Date: Tue Aug 14 14:49:14 UTC 2018
Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/doc: TODO.smpnet
src/share/man/man4: Makefile
src/sys/conf: files
src/sys/net: Makefile files.net
src/sys/netinet: in_proto.c
src/sys/netinet6: in6_proto.c
Removed Files:
src/share/man/man4: etherip.4
src/sys/net: if_etherip.c if_etherip.h
src/sys/netinet: ip_etherip.c ip_etherip.h
src/sys/netinet6: ip6_etherip.c ip6_etherip.h
src/sys/rump/include/opt: etherip.h
Log Message:
Retire EtherIP, we have L2TP instead.
To generate a diff of this commit:
cvs rdiff -u -r1.2218 -r1.2219 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1608 -r1.1609 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.22 -r1.23 src/doc/TODO.smpnet
cvs rdiff -u -r1.663 -r1.664 src/share/man/man4/Makefile
cvs rdiff -u -r1.8 -r0 src/share/man/man4/etherip.4
cvs rdiff -u -r1.1202 -r1.1203 src/sys/conf/files
cvs rdiff -u -r1.36 -r1.37 src/sys/net/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/net/files.net
cvs rdiff -u -r1.43 -r0 src/sys/net/if_etherip.c
cvs rdiff -u -r1.12 -r0 src/sys/net/if_etherip.h
cvs rdiff -u -r1.128 -r1.129 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.21 -r0 src/sys/netinet/ip_etherip.c
cvs rdiff -u -r1.1 -r0 src/sys/netinet/ip_etherip.h
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.22 -r0 src/sys/netinet6/ip6_etherip.c
cvs rdiff -u -r1.2 -r0 src/sys/netinet6/ip6_etherip.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/include/opt/etherip.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2218 src/distrib/sets/lists/comp/mi:1.2219
--- src/distrib/sets/lists/comp/mi:1.2218 Mon Aug 13 08:26:49 2018
+++ src/distrib/sets/lists/comp/mi Tue Aug 14 14:49:13 2018
@@ -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
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1608 src/distrib/sets/lists/man/mi:1.1609
--- src/distrib/sets/lists/man/mi:1.1608 Sun Aug 12 17:11:55 2018
+++ src/distrib/sets/lists/man/mi Tue Aug 14 14:49:13 2018
@@ -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
Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.22 src/doc/TODO.smpnet:1.23
--- src/doc/TODO.smpnet:1.22 Tue Aug 7 07:19:28 2018
+++ src/doc/TODO.smpnet Tue Aug 14 14:49:13 2018
@@ -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)
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.663 src/share/man/man4/Makefile:1.664
--- src/share/man/man4/Makefile:1.663 Wed Aug 8 21:15:41 2018
+++ src/share/man/man4/Makefile Tue Aug 14 14:49:13 2018
@@ -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 a
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 \
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1202 src/sys/conf/files:1.1203
--- src/sys/conf/files:1.1202 Sun Jul 15 07:07:15 2018
+++ src/sys/conf/files Tue Aug 14 14:49:13 2018
@@ -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
Index: src/sys/net/Makefile
diff -u src/sys/net/Makefile:1.36 src/sys/net/Makefile:1.37
--- src/sys/net/Makefile:1.36 Fri Feb 16 10:19:04 2018
+++ src/sys/net/Makefile Tue Aug 14 14:49:13 2018
@@ -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 \
Index: src/sys/net/files.net
diff -u src/sys/net/files.net:1.16 src/sys/net/files.net:1.17
--- src/sys/net/files.net:1.16 Tue Feb 27 14:28:01 2018
+++ src/sys/net/files.net Tue Aug 14 14:49:13 2018
@@ -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-fl
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
Index: src/sys/netinet/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.128 src/sys/netinet/in_proto.c:1.129
--- src/sys/netinet/in_proto.c:1.128 Thu May 3 07:13:48 2018
+++ src/sys/netinet/in_proto.c Tue Aug 14 14:49:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in_proto.c,v 1.128 2018/05/03 07:13:48 maxv Exp $ */
+/* $NetBSD: in_proto.c,v 1.129 2018/08/14 14:49:14 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.128 2018/05/03 07:13:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.129 2018/08/14 14:49:14 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mrouting.h"
@@ -144,11 +144,6 @@ __KERNEL_RCSID(0, "$NetBSD: in_proto.c,v
#include <net/if_pfsync.h>
#endif
-#include "etherip.h"
-#if NETHERIP > 0
-#include <netinet/ip_etherip.h>
-#endif
-
DOMAIN_DEFINE(inetdomain); /* forward declare and add to link set */
/* Wrappers to acquire kernel_lock. */
@@ -195,9 +190,6 @@ PR_WRAP_INPUT(dccp_input)
PR_WRAP_INPUT(sctp_input)
#endif
PR_WRAP_INPUT(rip_input)
-#if NETHERIP > 0
-PR_WRAP_INPUT(ip_etherip_input)
-#endif
#if NPFSYNC > 0
PR_WRAP_INPUT(pfsync_input)
#endif
@@ -211,7 +203,6 @@ PR_WRAP_INPUT(pim_input)
#define dccp_input dccp_input_wrapper
#define sctp_input sctp_input_wrapper
#define rip_input rip_input_wrapper
-#define ip_etherip_input ip_etherip_input_wrapper
#define pfsync_input pfsync_input_wrapper
#define igmp_input igmp_input_wrapper
#define pim_input pim_input_wrapper
@@ -416,17 +407,6 @@ const struct protosw inetsw[] = {
.pr_init = encap_init,
},
#endif /* INET6 */
-#if NETHERIP > 0
-{ .pr_type = SOCK_RAW,
- .pr_domain = &inetdomain,
- .pr_protocol = IPPROTO_ETHERIP,
- .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
- .pr_input = ip_etherip_input,
- .pr_ctlinput = rip_ctlinput,
- .pr_ctloutput = rip_ctloutput,
- .pr_usrreqs = &rip_usrreqs,
-},
-#endif /* NETHERIP > 0 */
#if NCARP > 0
{ .pr_type = SOCK_RAW,
.pr_domain = &inetdomain,
Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.125 src/sys/netinet6/in6_proto.c:1.126
--- src/sys/netinet6/in6_proto.c:1.125 Fri May 11 09:43:59 2018
+++ src/sys/netinet6/in6_proto.c Tue Aug 14 14:49:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.125 2018/05/11 09:43:59 roy Exp $ */
+/* $NetBSD: in6_proto.c,v 1.126 2018/08/14 14:49:14 maxv Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.125 2018/05/11 09:43:59 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.126 2018/08/14 14:49:14 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -130,11 +130,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c,
#include <netinet/ip_carp.h>
#endif
-#include "etherip.h"
-#if NETHERIP > 0
-#include <netinet6/ip6_etherip.h>
-#endif
-
#include <netinet6/ip6protosw.h>
/*
@@ -194,9 +189,6 @@ PR_WRAP_INPUT6(rip6_input)
PR_WRAP_INPUT6(dest6_input)
PR_WRAP_INPUT6(route6_input)
PR_WRAP_INPUT6(frag6_input)
-#if NETHERIP > 0
-PR_WRAP_INPUT6(ip6_etherip_input)
-#endif
#if NPFSYNC > 0
PR_WRAP_INPUT6(pfsync_input)
#endif
@@ -210,7 +202,6 @@ PR_WRAP_INPUT6(pim6_input)
#define dest6_input dest6_input_wrapper
#define route6_input route6_input_wrapper
#define frag6_input frag6_input_wrapper
-#define ip6_etherip_input ip6_etherip_input_wrapper
#define pim6_input pim6_input_wrapper
#endif
@@ -434,17 +425,6 @@ const struct ip6protosw inet6sw[] = {
.pr_usrreqs = &rip6_usrreqs,
.pr_init = encap_init,
},
-#if NETHERIP > 0
-{ .pr_type = SOCK_RAW,
- .pr_domain = &inet6domain,
- .pr_protocol = IPPROTO_ETHERIP,
- .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
- .pr_input = ip6_etherip_input,
- .pr_ctlinput = rip6_ctlinput,
- .pr_ctloutput = rip6_ctloutput,
- .pr_usrreqs = &rip6_usrreqs,
-},
-#endif
#if NCARP > 0
{ .pr_type = SOCK_RAW,
.pr_domain = &inet6domain,
