linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index e923d4d..ab7a912 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -6,6 +6,8 @@
 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.
@@ -20,7 +22,7 @@ config IPV6
          module will be called ipv6.
 
 config IPV6_PRIVACY
-       bool "IPv6: Privacy Extensions support"
+       bool "IPv6: Privacy Extensions (RFC 3041) support"
        depends on IPV6
        ---help---
          Privacy Extensions for Stateless Address Autoconfiguration in IPv6
@@ -28,9 +30,6 @@ config IPV6_PRIVACY
          pseudo-random global-scope unicast address(es) will assigned to
          your interface(s).
        
-         We use our standard pseudo random algorithm to generate randomized
-         interface identifier, instead of one described in RFC 3041.
-
          By default, kernel do not generate temporary addresses.
          To use temporary addresses, do
        
@@ -38,25 +37,6 @@ config IPV6_PRIVACY
 
          See <file:Documentation/networking/ip-sysctl.txt> for details.
 
-config IPV6_ROUTER_PREF
-       bool "IPv6: Router Preference (RFC 4191) support"
-       depends on IPV6
-       ---help---
-         Router Preference is an optional extension to the Router
-         Advertisement message to improve the ability of hosts
-         to pick more appropriate router, especially when the hosts
-         is placed in a multi-homed network.
-
-         If unsure, say N.
-
-config IPV6_ROUTE_INFO
-       bool "IPv6: Route Information (RFC 4191) support (EXPERIMENTAL)"
-       depends on IPV6_ROUTER_PREF && EXPERIMENTAL
-       ---help---
-         This is experimental support of Route Information.
-
-         If unsure, say N.
-
 config INET6_AH
        tristate "IPv6: AH transformation"
        depends on IPV6
@@ -88,7 +68,7 @@ config INET6_IPCOMP
        tristate "IPv6: IPComp transformation"
        depends on IPV6
        select XFRM
-       select INET6_XFRM_TUNNEL
+       select INET6_TUNNEL
        select CRYPTO
        select CRYPTO_DEFLATE
        ---help---
@@ -97,38 +77,19 @@ config INET6_IPCOMP
 
          If unsure, say Y.
 
-config INET6_XFRM_TUNNEL
-       tristate
-       select INET6_TUNNEL
-       default n
-
 config INET6_TUNNEL
-       tristate
-       default n
-
-config INET6_XFRM_MODE_TRANSPORT
-       tristate "IPv6: IPsec transport mode"
+       tristate "IPv6: tunnel transformation"
        depends on IPV6
-       default IPV6
        select XFRM
        ---help---
-         Support for IPsec transport mode.
-
-         If unsure, say Y.
-
-config INET6_XFRM_MODE_TUNNEL
-       tristate "IPv6: IPsec tunnel mode"
-       depends on IPV6
-       default IPV6
-       select XFRM
-       ---help---
-         Support for IPsec tunnel mode.
-
+         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"
-       select INET6_TUNNEL
        depends on IPV6
        ---help---
          Support for IPv6-in-IPv6 tunnels described in RFC 2473.