Module Name: src Committed By: alnsn Date: Thu Jun 12 12:13:36 UTC 2014
Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add a comment about disabling INET6. Should fix kern/48901. To generate a diff of this commit: cvs rdiff -u -r1.388 -r1.389 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.388 src/sys/arch/amd64/conf/GENERIC:1.389 --- src/sys/arch/amd64/conf/GENERIC:1.388 Tue Jun 10 01:42:39 2014 +++ src/sys/arch/amd64/conf/GENERIC Thu Jun 12 12:13:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.388 2014/06/10 01:42:39 hikaru Exp $ +# $NetBSD: GENERIC,v 1.389 2014/06/12 12:13:36 alnsn 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.388 $" +#ident "GENERIC-$Revision: 1.389 $" maxusers 64 # estimated number of users @@ -175,7 +175,7 @@ options NFSSERVER # Network File System # Networking options #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP -options INET6 # IPV6 +options INET6 # IPV6 (disable it together with stf device) options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MPLS # MultiProtocol Label Switching (needs ifmpls)