Module Name: src
Committed By: jym
Date: Sun Feb 13 04:21:23 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
Missing MPLS options (commented out).
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.302 src/sys/arch/amd64/conf/GENERIC:1.303
--- src/sys/arch/amd64/conf/GENERIC:1.302 Fri Feb 11 02:06:09 2011
+++ src/sys/arch/amd64/conf/GENERIC Sun Feb 13 04:21:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.302 2011/02/11 02:06:09 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.303 2011/02/13 04:21:23 jym Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.302 $"
+#ident "GENERIC-$Revision: 1.303 $"
maxusers 64 # estimated number of users
@@ -175,6 +175,7 @@
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
+#options MPLS # MultiProtocol Label Switching (needs ifmpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
#options ISO,TPIP # OSI
