Module Name: src
Committed By: knakahara
Date: Thu Feb 16 08:45:43 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
Log Message:
add l2tp(4) to amd64/GENERIC and amd64/ALL config.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.450 -r1.451 src/sys/arch/amd64/conf/GENERIC
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.49 src/sys/arch/amd64/conf/ALL:1.50
--- src/sys/arch/amd64/conf/ALL:1.49 Thu Jan 12 05:24:36 2017
+++ src/sys/arch/amd64/conf/ALL Thu Feb 16 08:45:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.49 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: ALL,v 1.50 2017/02/16 08:45:42 knakahara 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.49 $"
+#ident "ALL-$Revision: 1.50 $"
maxusers 64 # estimated number of users
@@ -1573,6 +1573,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 pf # PF packet filter
#pseudo-device pflog # PF log if
#pseudo-device pfsync # PF sync if
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.450 src/sys/arch/amd64/conf/GENERIC:1.451
--- src/sys/arch/amd64/conf/GENERIC:1.450 Thu Jan 12 05:24:36 2017
+++ src/sys/arch/amd64/conf/GENERIC Thu Feb 16 08:45:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.450 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: GENERIC,v 1.451 2017/02/16 08:45:42 knakahara 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.450 $"
+#ident "GENERIC-$Revision: 1.451 $"
maxusers 64 # estimated number of users
@@ -1271,6 +1271,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 pf # PF packet filter
#pseudo-device pflog # PF log if
#pseudo-device pfsync # PF sync if
