nfsd4: consistent session flag setting

[safe/jmp/linux-2.6] / net / ipv6 / Kconfig

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ec99215..a578096 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -22,17 +22,17 @@ menuconfig IPV6
 if IPV6
 
 config IPV6_PRIVACY
-       bool "IPv6: Privacy Extensions support"
+       bool "IPv6: Privacy Extensions (RFC 3041) support"
        ---help---
          Privacy Extensions for Stateless Address Autoconfiguration in IPv6
-         support.  With this option, additional periodically-alter 
-         pseudo-random global-scope unicast address(es) will assigned to
+         support.  With this option, additional periodically-altered
+         pseudo-random global-scope unicast address(es) will be assigned to
          your interface(s).
        
-         We use our standard pseudo random algorithm to generate randomized
-         interface identifier, instead of one described in RFC 3041.
+         We use our standard pseudo-random algorithm to generate the
+          randomized interface identifier, instead of one described in RFC 3041.
 
-         By default, kernel do not generate temporary addresses.
+         By default the kernel does not generate temporary addresses.
          To use temporary addresses, do
        
                echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr 
@@ -43,9 +43,9 @@ config IPV6_ROUTER_PREF
        bool "IPv6: Router Preference (RFC 4191) support"
        ---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.
+         Advertisement message which improves the ability of hosts
+         to pick an appropriate router, especially when the hosts
+         are placed in a multi-homed network.
 
          If unsure, say N.
 
@@ -168,7 +168,26 @@ config IPV6_SIT
          into IPv4 packets. This is useful if you want to connect two IPv6
          networks over an IPv4-only path.
 
-         Saying M here will produce a module called sit.ko. If unsure, say Y.
+         Saying M here will produce a module called sit. If unsure, say Y.
+
+config IPV6_SIT_6RD
+       bool "IPv6: IPv6 Rapid Deployment (6RD) (EXPERIMENTAL)"
+       depends on IPV6_SIT && EXPERIMENTAL
+       default n
+       ---help---
+         IPv6 Rapid Deployment (6rd; draft-ietf-softwire-ipv6-6rd) builds upon
+         mechanisms of 6to4 (RFC3056) to enable a service provider to rapidly
+         deploy IPv6 unicast service to IPv4 sites to which it provides
+         customer premise equipment.  Like 6to4, it utilizes stateless IPv6 in
+         IPv4 encapsulation in order to transit IPv4-only network
+         infrastructure.  Unlike 6to4, a 6rd service provider uses an IPv6
+         prefix of its own in place of the fixed 6to4 prefix.
+
+         With this option enabled, the SIT driver offers 6rd functionality by
+         providing additional ioctl API to configure the IPv6 Prefix for in
+         stead of static 2002::/16 for 6to4.
+
+         If unsure, say N.
 
 config IPV6_NDISC_NODETYPE
        bool