Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Replace references to etherip by l2tp. Etherip was ...



details:   https://anonhg.NetBSD.org/src/rev/48577dbd749b
branches:  trunk
changeset: 365416:48577dbd749b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue Aug 14 06:37:59 2018 +0000

description:
Replace references to etherip by l2tp. Etherip was already not enabled
anyway.

diffstat:

 sys/arch/amd64/conf/ALL               |  5 ++---
 sys/arch/amd64/conf/GENERIC           |  5 ++---
 sys/arch/evbmips/conf/LINKITSMART7688 |  4 ++--
 sys/arch/i386/conf/ALL                |  5 ++---
 sys/arch/i386/conf/GENERIC            |  5 ++---
 sys/arch/ia64/conf/GENERIC.SKI        |  6 +++---
 6 files changed, 13 insertions(+), 17 deletions(-)

diffs (149 lines):

diff -r f69685b9bbe5 -r 48577dbd749b sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Tue Aug 14 06:27:44 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Tue Aug 14 06:37:59 2018 +0000
@@ -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 @@
 
 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 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
 
diff -r f69685b9bbe5 -r 48577dbd749b sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Aug 14 06:27:44 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Aug 14 06:37:59 2018 +0000
@@ -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 @@
 
 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 @@
 #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
diff -r f69685b9bbe5 -r 48577dbd749b sys/arch/evbmips/conf/LINKITSMART7688
--- a/sys/arch/evbmips/conf/LINKITSMART7688     Tue Aug 14 06:27:44 2018 +0000
+++ b/sys/arch/evbmips/conf/LINKITSMART7688     Tue Aug 14 06:37:59 2018 +0000
@@ -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 @@
 #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
 
diff -r f69685b9bbe5 -r 48577dbd749b sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Tue Aug 14 06:27:44 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Tue Aug 14 06:37:59 2018 +0000
@@ -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 @@
 
 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  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
diff -r f69685b9bbe5 -r 48577dbd749b sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue Aug 14 06:27:44 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue Aug 14 06:37:59 2018 +0000
@@ -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 @@
 
 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  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
 
diff -r f69685b9bbe5 -r 48577dbd749b sys/arch/ia64/conf/GENERIC.SKI
--- a/sys/arch/ia64/conf/GENERIC.SKI    Tue Aug 14 06:27:44 2018 +0000
+++ b/sys/arch/ia64/conf/GENERIC.SKI    Tue Aug 14 06:37:59 2018 +0000
@@ -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 @@
 
 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 @@
 #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
 



Home | Main Index | Thread Index | Old Index