libata: improve ata_down_xfermask_limit()

[powerpc.git] / net / ipv6 / Kconfig

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ef5eaad..79682ef 100644 (file)
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -156,6 +156,7 @@ config INET6_XFRM_MODE_ROUTEOPTIMIZATION
 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
@@ -175,9 +176,16 @@ 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 && EXPERIMENTAL
+       depends on IPV6_MULTIPLE_TABLES
        ---help---
          Enable routing by source address or prefix.
 
@@ -189,17 +197,3 @@ config IPV6_SUBTREES
 
          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).
-