Module Name: src
Committed By: maxv
Date: Tue Aug 14 06:04:24 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: ALL GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU
Log Message:
Enable L2TP on all x86 configurations, not just native amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.445 -r1.446 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1188 -r1.1189 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/XEN3PAE_DOMU
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/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.154 src/sys/arch/amd64/conf/XEN3_DOM0:1.155
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.154 Wed Aug 1 16:59:09 2018
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Aug 14 06:04:24 2018
@@ -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 INCLUDE_CONFIG_FILE # embed con
#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 stf # 6to4 IPv6 over IPv
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
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.86 src/sys/arch/amd64/conf/XEN3_DOMU:1.87
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.86 Wed Aug 1 16:59:09 2018
+++ src/sys/arch/amd64/conf/XEN3_DOMU Tue Aug 14 06:04:24 2018
@@ -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 INCLUDE_CONFIG_FILE # embed con
#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 stf # 6to4 IPv6 over IPv
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
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.445 src/sys/arch/i386/conf/ALL:1.446
--- src/sys/arch/i386/conf/ALL:1.445 Wed Aug 1 18:36:14 2018
+++ src/sys/arch/i386/conf/ALL Tue Aug 14 06:04:24 2018
@@ -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 @@ include "arch/i386/conf/std.i386"
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 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.1188 src/sys/arch/i386/conf/GENERIC:1.1189
--- src/sys/arch/i386/conf/GENERIC:1.1188 Mon Aug 13 18:48:53 2018
+++ src/sys/arch/i386/conf/GENERIC Tue Aug 14 06:04:24 2018
@@ -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 @@ include "arch/i386/conf/std.i386"
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 vlan # IEEE 802.1q encap
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
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.3 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.4
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.3 Wed Aug 1 16:59:10 2018
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Tue Aug 14 06:04:24 2018
@@ -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 stf # 6to4 IPv6 over IPv
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
Index: src/sys/arch/i386/conf/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.4 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.5
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.4 Wed Aug 1 16:59:10 2018
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Tue Aug 14 06:04:24 2018
@@ -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 stf # 6to4 IPv6 over IPv
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
