vserver 2.0-rc4

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

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index f5b5688..e66ca93 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -4,8 +4,6 @@
 config IPV6_PRIVACY
        bool "IPv6: Privacy Extensions (RFC 3041) support"
        depends on IPV6
-       select CRYPTO
-       select CRYPTO_MD5
        ---help---
          Privacy Extensions for Stateless Address Autoconfiguration in IPv6
          support.  With this option, additional periodically-alter 
@@ -50,17 +48,30 @@ 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
+       select INET6_TUNNEL
        ---help---
          Support for IPv6-in-IPv6 tunnels described in RFC 2473.