1 files changed, 45 insertions, 0 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index e923d4dea418..a2d211da2aba 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -77,6 +77,7 @@ config INET6_ESP
         select CRYPTO
         select CRYPTO_HMAC
         select CRYPTO_MD5
+        select CRYPTO_CBC
         select CRYPTO_SHA1
         select CRYPTO_DES
         ---help---
@@ -97,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
@@ -126,6 +136,13 @@ config INET6_XFRM_MODE_TUNNEL
 
           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
@@ -135,3 +152,31 @@ config IPV6_TUNNEL
 
           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).
+