Merge HEAD from ../linux-2.6

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

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 95163cd52ae084d9d51c52e878631378e0cf4718..e6f83b6a2b76beec7b1a82d03fdc3fdb604c4e9f 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -6,8 +6,6 @@
 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.
@@ -22,7 +20,7 @@ config IPV6
          module will be called ipv6.
 
 config IPV6_PRIVACY
-       bool "IPv6: Privacy Extensions (RFC 3041) support"
+       bool "IPv6: Privacy Extensions support"
        depends on IPV6
        ---help---
          Privacy Extensions for Stateless Address Autoconfiguration in IPv6
@@ -30,6 +28,9 @@ 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
        
@@ -37,6 +38,25 @@ 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
@@ -91,7 +111,6 @@ config INET6_TUNNEL
 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.