[XFRM]: xfrm_state_lookup() annotations

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

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index f925f20..a2d211d 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -38,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
@@ -58,6 +77,7 @@ config INET6_ESP
        select CRYPTO
        select CRYPTO_HMAC
        select CRYPTO_MD5
+       select CRYPTO_CBC
        select CRYPTO_SHA1
        select CRYPTO_DES
        ---help---
@@ -69,7 +89,7 @@ config INET6_IPCOMP
        tristate "IPv6: IPComp transformation"
        depends on IPV6
        select XFRM
-       select INET6_TUNNEL
+       select INET6_XFRM_TUNNEL
        select CRYPTO
        select CRYPTO_DEFLATE
        ---help---
@@ -78,22 +98,85 @@ 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
+       default n
+
 config INET6_TUNNEL
-       tristate "IPv6: tunnel transformation"
+       tristate
+       default n
+
+config INET6_XFRM_MODE_TRANSPORT
+       tristate "IPv6: IPsec transport mode"
+       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 generic IPv6-in-IPv6 tunnel transformation, which is
-         required by the IPv6-in-IPv6 tunneling module as well as tunnel mode
-         IPComp.
-         
+         Support for IPsec tunnel 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_TUNNEL
        tristate "IPv6: IPv6-in-IPv6 tunnel"
+       select INET6_TUNNEL
        depends on IPV6
        ---help---
          Support for IPv6-in-IPv6 tunnels described in RFC 2473.
 
          If unsure, say N.
 
+config IPV6_SUBTREES
+       bool "IPv6: source address based routing"
+       depends on IPV6 && EXPERIMENTAL
+       ---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.
+
+config IPV6_MULTIPLE_TABLES
+       bool "IPv6: Multiple Routing Tables"
+       depends on IPV6 && EXPERIMENTAL
+       select FIB_RULES
+       ---help---
+         Support multiple routing tables.
+
+config IPV6_ROUTE_FWMARK
+       bool "IPv6: use netfilter MARK value as routing key"
+       depends on IPV6_MULTIPLE_TABLES && NETFILTER
+       ---help---
+         If you say Y here, you will be able to specify different routes for
+         packets with different mark values (see iptables(8), MARK target).
+