Module Name: src
Committed By: maxv
Date: Tue Aug 14 06:37:59 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbmips/conf: LINKITSMART7688
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/ia64/conf: GENERIC.SKI
Log Message:
Replace references to etherip by l2tp. Etherip was already not enabled
anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.502 -r1.503 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/LINKITSMART7688
cvs rdiff -u -r1.446 -r1.447 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1189 -r1.1190 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/conf/GENERIC.SKI
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.96 src/sys/arch/amd64/conf/ALL:1.97
--- src/sys/arch/amd64/conf/ALL:1.96 Wed Aug 1 18:36:13 2018
+++ src/sys/arch/amd64/conf/ALL Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.96 2018/08/01 18:36:13 khorben Exp $
+# $NetBSD: ALL,v 1.97 2018/08/14 06:37:59 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.96 $"
+#ident "ALL-$Revision: 1.97 $"
maxusers 64 # estimated number of users
@@ -1631,7 +1631,6 @@ pseudo-device l2tp # L2TPv3 interface
#pseudo-device pfsync # PF sync if
pseudo-device npf # NPF packet filter
pseudo-device kttcp
-pseudo-device etherip # EtherIP
# srt is EXPERIMENTAL
pseudo-device srt # source-address-based routing
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.502 src/sys/arch/amd64/conf/GENERIC:1.503
--- src/sys/arch/amd64/conf/GENERIC:1.502 Mon Aug 13 17:37:52 2018
+++ src/sys/arch/amd64/conf/GENERIC Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.502 2018/08/13 17:37:52 mrg Exp $
+# $NetBSD: GENERIC,v 1.503 2018/08/14 06:37:59 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.502 $"
+#ident "GENERIC-$Revision: 1.503 $"
maxusers 64 # estimated number of users
@@ -1118,7 +1118,6 @@ pseudo-device bridge # simple inter-ne
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device l2tp # L2TPv3 interface
-#pseudo-device etherip # Tunnel Ethernet over IP
pseudo-device npf # NPF packet filter
#pseudo-device canloop # CAN loopback interface
Index: src/sys/arch/evbmips/conf/LINKITSMART7688
diff -u src/sys/arch/evbmips/conf/LINKITSMART7688:1.7 src/sys/arch/evbmips/conf/LINKITSMART7688:1.8
--- src/sys/arch/evbmips/conf/LINKITSMART7688:1.7 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbmips/conf/LINKITSMART7688 Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: LINKITSMART7688,v 1.7 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: LINKITSMART7688,v 1.8 2018/08/14 06:37:59 maxv Exp $
#
# MediaTek MT7688
#
@@ -249,7 +249,7 @@ pseudo-device bridge # simple inter-ne
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device npf # NPF packet filter
-#pseudo-device etherip # Tunnel Ethernet over IP
+#pseudo-device l2tp # L2TPv3 interface
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.446 src/sys/arch/i386/conf/ALL:1.447
--- src/sys/arch/i386/conf/ALL:1.446 Tue Aug 14 06:04:24 2018
+++ src/sys/arch/i386/conf/ALL Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.446 2018/08/14 06:04:24 maxv Exp $
+# $NetBSD: ALL,v 1.447 2018/08/14 06:37:59 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.446 $"
+#ident "ALL-$Revision: 1.447 $"
maxusers 64 # estimated number of users
@@ -1768,7 +1768,6 @@ pseudo-device pflog # PF log if
pseudo-device pfsync # PF sync if
#pseudo-device npf # NPF packet filter
pseudo-device kttcp
-pseudo-device etherip # EtherIP
pseudo-device l2tp # L2TPv3 interface
# srt is EXPERIMENTAL
pseudo-device srt # source-address-based routing
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1189 src/sys/arch/i386/conf/GENERIC:1.1190
--- src/sys/arch/i386/conf/GENERIC:1.1189 Tue Aug 14 06:04:24 2018
+++ src/sys/arch/i386/conf/GENERIC Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1189 2018/08/14 06:04:24 maxv Exp $
+# $NetBSD: GENERIC,v 1.1190 2018/08/14 06:37:59 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1189 $"
+#ident "GENERIC-$Revision: 1.1190 $"
maxusers 64 # estimated number of users
@@ -1479,7 +1479,6 @@ pseudo-device bridge # simple inter-ne
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device l2tp # L2TPv3 interface
pseudo-device npf # NPF packet filter
-#pseudo-device etherip # Tunnel Ethernet over IP
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/ia64/conf/GENERIC.SKI
diff -u src/sys/arch/ia64/conf/GENERIC.SKI:1.14 src/sys/arch/ia64/conf/GENERIC.SKI:1.15
--- src/sys/arch/ia64/conf/GENERIC.SKI:1.14 Wed Aug 1 20:04:12 2018
+++ src/sys/arch/ia64/conf/GENERIC.SKI Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.SKI,v 1.14 2018/08/01 20:04:12 maxv Exp $
+# $NetBSD: GENERIC.SKI,v 1.15 2018/08/14 06:37:59 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ia64/conf/std.ia64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.14 $"
+#ident "GENERIC-$Revision: 1.15 $"
maxusers 32 # estimated number of users
@@ -150,7 +150,7 @@ pseudo-device loop # network loopback
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device npf # NPF packet filter
-#pseudo-device etherip # Tunnel Ethernet over IP
+#pseudo-device l2tp # L2TPv3 interface
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
