This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / net / ipv6 / Kconfig

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 23c5759..ab7a912 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -1,6 +1,26 @@
 #
 # IPv6 configuration
-# 
+#
+
+#   IPv6 as module will cause a CRASH if you try to unload it
+config IPV6
+       tristate "The IPv6 protocol"
+       default m
+       select CRYPTO if IPV6_PRIVACY
+       select CRYPTO_MD5 if IPV6_PRIVACY
+       ---help---
+         This is complemental support for the IP version 6.
+         You will still be able to do traditional IPv4 networking as well.
+
+         For general information about IPv6, see
+         <http://playground.sun.com/pub/ipng/html/ipng-main.html>.
+         For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
+         For specific information about IPv6 under Linux, read the HOWTO at
+         <http://www.bieringer.de/linux/IPv6/>.
+
+         To compile this protocol support as a module, choose M here: the 
+         module will be called ipv6.
+
 config IPV6_PRIVACY
        bool "IPv6: Privacy Extensions (RFC 3041) support"
        depends on IPV6
@@ -48,14 +68,26 @@ config INET6_IPCOMP
        tristate "IPv6: IPComp transformation"
        depends on IPV6
        select XFRM
+       select INET6_TUNNEL
        select CRYPTO
        select CRYPTO_DEFLATE
        ---help---
-         Support for IP Paylod Compression (RFC3173), typically needed
-         for IPsec.
+         Support for IP Payload Compression Protocol (IPComp) (RFC3173),
+         typically needed for IPsec.
 
          If unsure, say Y.
 
+config INET6_TUNNEL
+       tristate "IPv6: tunnel transformation"
+       depends on IPV6
+       select XFRM
+       ---help---
+         Support for generic IPv6-in-IPv6 tunnel transformation, which is
+         required by the IPv6-in-IPv6 tunneling module as well as tunnel mode
+         IPComp.
+         
+         If unsure, say Y.
+
 config IPV6_TUNNEL
        tristate "IPv6: IPv6-in-IPv6 tunnel"
        depends on IPV6