aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Nuorvala <vnuorval@tcs.hut.fi>2006-10-16 22:12:21 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-18 19:55:29 -0700
commit264e91b68aff1e39b558123498f28bf5aa68b4ee (patch)
treee31791e845b23f7481733aefbd55965a30c9ed23
parente0eda7bbaae48ea56f1f1943ea90df72d459b9b0 (diff)
downloadkernel_samsung_tuna-264e91b68aff1e39b558123498f28bf5aa68b4ee.zip
kernel_samsung_tuna-264e91b68aff1e39b558123498f28bf5aa68b4ee.tar.gz
kernel_samsung_tuna-264e91b68aff1e39b558123498f28bf5aa68b4ee.tar.bz2
[IPV6]: Make IPV6_SUBTREES depend on IPV6_MULTIPLE_TABLES.
As IPV6_SUBTREES can't work without IPV6_MULTIPLE_TABLES have IPV6_SUBTREES depend on it. Signed-off-by: Ville Nuorvala <vnuorval@tcs.hut.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/Kconfig16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ef5eaad..6e48f52 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -175,9 +175,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,13 +196,6 @@ 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