Source-Changes-HG archive

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

[src/trunk]: src/sys/arch Enable L2TP on all x86 configurations, not just nat...



details:   https://anonhg.NetBSD.org/src/rev/dbe9a2a37073
branches:  trunk
changeset: 992110:dbe9a2a37073
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue Aug 14 06:04:24 2018 +0000

description:
Enable L2TP on all x86 configurations, not just native amd64.

diffstat:

 sys/arch/amd64/conf/XEN3_DOM0   |  5 +++--
 sys/arch/amd64/conf/XEN3_DOMU   |  5 +++--
 sys/arch/i386/conf/ALL          |  5 +++--
 sys/arch/i386/conf/GENERIC      |  5 +++--
 sys/arch/i386/conf/XEN3PAE_DOM0 |  3 ++-
 sys/arch/i386/conf/XEN3PAE_DOMU |  3 ++-
 6 files changed, 16 insertions(+), 10 deletions(-)

diffs (138 lines):

diff -r 6e22bd119e62 -r dbe9a2a37073 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Tue Aug 14 05:51:54 2018 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Tue Aug 14 06:04:24 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.154 2018/08/01 16:59:09 maxv Exp $
+# $NetBSD: XEN3_DOM0,v 1.155 2018/08/14 06:04:24 maxv Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@
 #options       UVMHIST_PRINT
 #options       SYSCALL_DEBUG
 
-#ident         "XEN3_DOM0-$Revision: 1.154 $"
+#ident         "XEN3_DOM0-$Revision: 1.155 $"
 
 maxusers       32              # estimated number of users
 
@@ -871,6 +871,7 @@
 pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  bridge                  # simple inter-network bridging
 #options       BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
+pseudo-device  l2tp                    # L2TPv3 interface
 pseudo-device  npf                     # NPF packet filter
 
 # miscellaneous pseudo-devices
diff -r 6e22bd119e62 -r dbe9a2a37073 sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU     Tue Aug 14 05:51:54 2018 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU     Tue Aug 14 06:04:24 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.86 2018/08/01 16:59:09 maxv Exp $
+# $NetBSD: XEN3_DOMU,v 1.87 2018/08/14 06:04:24 maxv Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@
 #options       UVMHIST_PRINT
 #options       SYSCALL_DEBUG
 
-#ident         "XEN3_DOMU-$Revision: 1.86 $"
+#ident         "XEN3_DOMU-$Revision: 1.87 $"
 
 maxusers       32              # estimated number of users
 
@@ -217,6 +217,7 @@
 pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  bridge                  # simple inter-network bridging
 #options       BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
+pseudo-device  l2tp                    # L2TPv3 interface
 pseudo-device  npf                     # NPF packet filter
 
 options        PAX_MPROTECT=1          # PaX mprotect(2) restrictions
diff -r 6e22bd119e62 -r dbe9a2a37073 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Tue Aug 14 05:51:54 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Tue Aug 14 06:04:24 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.445 2018/08/01 18:36:14 khorben Exp $
+# $NetBSD: ALL,v 1.446 2018/08/14 06:04:24 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.445 $"
+#ident         "ALL-$Revision: 1.446 $"
 
 maxusers       64              # estimated number of users
 
@@ -1769,6 +1769,7 @@
 #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 6e22bd119e62 -r dbe9a2a37073 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue Aug 14 05:51:54 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue Aug 14 06:04:24 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1188 2018/08/13 18:48:53 mrg Exp $
+# $NetBSD: GENERIC,v 1.1189 2018/08/14 06:04:24 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1188 $"
+#ident         "GENERIC-$Revision: 1.1189 $"
 
 maxusers       64              # estimated number of users
 
@@ -1477,6 +1477,7 @@
 pseudo-device  bridge                  # simple inter-network bridging
 #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  npf                     # NPF packet filter
 #pseudo-device etherip                 # Tunnel Ethernet over IP
 # srt is EXPERIMENTAL
diff -r 6e22bd119e62 -r dbe9a2a37073 sys/arch/i386/conf/XEN3PAE_DOM0
--- a/sys/arch/i386/conf/XEN3PAE_DOM0   Tue Aug 14 05:51:54 2018 +0000
+++ b/sys/arch/i386/conf/XEN3PAE_DOM0   Tue Aug 14 06:04:24 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: XEN3PAE_DOM0,v 1.3 2018/08/01 16:59:10 maxv Exp $
+#      $NetBSD: XEN3PAE_DOM0,v 1.4 2018/08/14 06:04:24 maxv Exp $
 #
 #      XEN3_0: Xen 3.0 domain0 kernel
 
@@ -830,6 +830,7 @@
 pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  bridge                  # simple inter-network bridging
 #options       BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
+pseudo-device  l2tp                    # L2TPv3 interface
 pseudo-device  npf                     # NPF packet filter
 
 # accept filters
diff -r 6e22bd119e62 -r dbe9a2a37073 sys/arch/i386/conf/XEN3PAE_DOMU
--- a/sys/arch/i386/conf/XEN3PAE_DOMU   Tue Aug 14 05:51:54 2018 +0000
+++ b/sys/arch/i386/conf/XEN3PAE_DOMU   Tue Aug 14 06:04:24 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.4 2018/08/01 16:59:10 maxv Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.5 2018/08/14 06:04:24 maxv Exp $
 
 include        "arch/xen/conf/std.xen"
 
@@ -214,6 +214,7 @@
 pseudo-device  vlan                    # IEEE 802.1q encapsulation
 pseudo-device  bridge                  # simple inter-network bridging
 #options       BRIDGE_IPF              # bridge uses IP/IPv6 pfil hooks too
+pseudo-device  l2tp                    # L2TPv3 interface
 pseudo-device  npf                     # NPF packet filter
 
 # accept filters



Home | Main Index | Thread Index | Old Index