[IPV6] SIT: Disallow 0.0.0.0 in PRL and Flush PRL if given for DEL.

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

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 159c63d..47263e4 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -57,6 +57,16 @@ config IPV6_ROUTE_INFO
 
          If unsure, say N.
 
+config IPV6_OPTIMISTIC_DAD
+       bool "IPv6: Enable RFC 4429 Optimistic DAD (EXPERIMENTAL)"
+       depends on IPV6 && EXPERIMENTAL
+       ---help---
+         This is experimental support for optimistic Duplicate
+         Address Detection.  It allows for autoconfigured addresses
+         to be used more quickly.
+
+         If unsure, say N.
+
 config INET6_AH
        tristate "IPv6: AH transformation"
        depends on IPV6
@@ -75,6 +85,7 @@ config INET6_ESP
        depends on IPV6
        select XFRM
        select CRYPTO
+       select CRYPTO_AUTHENC
        select CRYPTO_HMAC
        select CRYPTO_MD5
        select CRYPTO_CBC
@@ -98,6 +109,15 @@ config INET6_IPCOMP
 
          If unsure, say Y.
 
+config IPV6_MIP6
+       tristate "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,18 +147,65 @@ 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"
+       tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)"
        select INET6_TUNNEL
        depends on IPV6
        ---help---
-         Support for IPv6-in-IPv6 tunnels described in RFC 2473.
+         Support for IPv6-in-IPv6 and IPv4-in-IPv6 tunnels described in
+         RFC 2473.
 
          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.
+