Pull fluff into release branch

[sfrench/cifs-2.6.git] / net / ipv6 / Kconfig

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 0ba06c0c5d390feb3bb3bb626e0cae8fa1645f1a..79682efb14beebd08cc875eadb3bea42b83f65cf 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -98,6 +98,15 @@ config INET6_IPCOMP
 
          If unsure, say Y.
 
+config IPV6_MIP6
+       bool "IPv6: Mobility (EXPERIMENTAL)"
+       depends on IPV6 && EXPERIMENTAL
+       select XFRM
+       ---help---
+         Support for IPv6 Mobility described in RFC 3775.
+
+         If unsure, say N.
+
 config INET6_XFRM_TUNNEL
        tristate
        select INET6_TUNNEL
@@ -127,6 +136,37 @@ config INET6_XFRM_MODE_TUNNEL
 
          If unsure, say Y.
 
+config INET6_XFRM_MODE_BEET
+       tristate "IPv6: IPsec BEET mode"
+       depends on IPV6
+       default IPV6
+       select XFRM
+       ---help---
+         Support for IPsec BEET mode.
+
+         If unsure, say Y.
+
+config INET6_XFRM_MODE_ROUTEOPTIMIZATION
+       tristate "IPv6: MIPv6 route optimization mode (EXPERIMENTAL)"
+       depends on IPV6 && EXPERIMENTAL
+       select XFRM
+       ---help---
+         Support for MIPv6 route optimization mode.
+
+config IPV6_SIT
+       tristate "IPv6: IPv6-in-IPv4 tunnel (SIT driver)"
+       depends on IPV6
+       select INET_TUNNEL
+       default y
+       ---help---
+         Tunneling means encapsulating data of one protocol type within
+         another protocol and sending it over a channel that understands the
+         encapsulating protocol. This driver implements encapsulation of IPv6
+         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.
+
 config IPV6_TUNNEL
        tristate "IPv6: IPv6-in-IPv6 tunnel"
        select INET6_TUNNEL
@@ -136,3 +176,24 @@ config IPV6_TUNNEL
 
          If unsure, say N.
 
+config IPV6_MULTIPLE_TABLES
+       bool "IPv6: Multiple Routing Tables"
+       depends on IPV6 && EXPERIMENTAL
+       select FIB_RULES
+       ---help---
+         Support multiple routing tables.
+
+config IPV6_SUBTREES
+       bool "IPv6: source address based routing"
+       depends on IPV6_MULTIPLE_TABLES
+       ---help---
+         Enable routing by source address or prefix.
+
+         The destination address is still the primary routing key, so mixing
+         normal and source prefix specific routes in the same routing table
+         may sometimes lead to unintended routing behavior.  This can be
+         avoided by defining different routing tables for the normal and
+         source prefix specific routes.
+
+         If unsure, say N.
+