diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-07-18 16:55:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-07-18 16:55:19 -0400 |
commit | 6876f95f201ce2d62367d85dd793c1fee351d7a6 (patch) | |
tree | 44031f94643969ebaa7ee2379efc2babaef17c4a | |
parent | 54208991e15fa00e37a9d172ac0d87191a832165 (diff) |
[IPV4]: fix IP_FIB_HASH kconfig warning
This patch fixes the following kconfig warning:
net/ipv4/Kconfig:92:warning: defaults for choice values not supported
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/Kconfig | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index df5386885a90..ecea2bc8229f 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
@@ -54,9 +54,9 @@ config IP_ADVANCED_ROUTER | |||
54 | choice | 54 | choice |
55 | prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)" | 55 | prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)" |
56 | depends on IP_ADVANCED_ROUTER | 56 | depends on IP_ADVANCED_ROUTER |
57 | default IP_FIB_HASH | 57 | default ASK_IP_FIB_HASH |
58 | 58 | ||
59 | config IP_FIB_HASH | 59 | config ASK_IP_FIB_HASH |
60 | bool "FIB_HASH" | 60 | bool "FIB_HASH" |
61 | ---help--- | 61 | ---help--- |
62 | Current FIB is very proven and good enough for most users. | 62 | Current FIB is very proven and good enough for most users. |
@@ -82,12 +82,8 @@ config IP_FIB_TRIE | |||
82 | 82 | ||
83 | endchoice | 83 | endchoice |
84 | 84 | ||
85 | # If the user does not enable advanced routing, he gets the safe | ||
86 | # default of the fib-hash algorithm. | ||
87 | config IP_FIB_HASH | 85 | config IP_FIB_HASH |
88 | bool | 86 | def_bool ASK_IP_FIB_HASH || !IP_ADVANCED_ROUTER |
89 | depends on !IP_ADVANCED_ROUTER | ||
90 | default y | ||
91 | 87 | ||
92 | config IP_MULTIPLE_TABLES | 88 | config IP_MULTIPLE_TABLES |
93 | bool "IP: policy routing" | 89 | bool "IP: policy routing" |