vserver 1.9.3

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

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 23c5759..fd87a5a 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -48,6 +48,7 @@ config INET6_IPCOMP
        tristate "IPv6: IPComp transformation"
        depends on IPV6
        select XFRM
+       select INET6_TUNNEL
        select CRYPTO
        select CRYPTO_DEFLATE
        ---help---
@@ -56,9 +57,21 @@ config INET6_IPCOMP
 
          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.