diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-26 09:55:10 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-26 09:55:10 -0500 |
| commit | de8fd087b280797977b012a4275ee53ff2999f3f (patch) | |
| tree | 5cd65289983ad65812a6a4335fe657eeb125a7f0 /net/ipv4/Kconfig | |
| parent | 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 (diff) | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
| download | kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.tar.gz kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.tar.xz kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.zip | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index df5386885a9..fc561c0ae8e 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -54,9 +54,9 @@ config IP_ADVANCED_ROUTER choice prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)" depends on IP_ADVANCED_ROUTER - default IP_FIB_HASH + default ASK_IP_FIB_HASH -config IP_FIB_HASH +config ASK_IP_FIB_HASH bool "FIB_HASH" ---help--- Current FIB is very proven and good enough for most users. @@ -82,12 +82,8 @@ config IP_FIB_TRIE endchoice -# If the user does not enable advanced routing, he gets the safe -# default of the fib-hash algorithm. config IP_FIB_HASH - bool - depends on !IP_ADVANCED_ROUTER - default y + def_bool ASK_IP_FIB_HASH || !IP_ADVANCED_ROUTER config IP_MULTIPLE_TABLES bool "IP: policy routing" @@ -239,7 +235,6 @@ config IP_PNP_RARP # bool ' IP: ARP support' CONFIG_IP_PNP_ARP config NET_IPIP tristate "IP: tunneling" - select INET_TUNNEL ---help--- Tunneling means encapsulating data of one protocol type within another protocol and sending it over a channel that understands the @@ -256,7 +251,6 @@ config NET_IPIP config NET_IPGRE tristate "IP: GRE tunnels over IP" - select XFRM help Tunneling means encapsulating data of one protocol type within another protocol and sending it over a channel that understands the |