ipv4: Remove fib_hash.

[cascardo/linux.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index a5a1050..cbb505b 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -55,45 +55,9 @@ config IP_ADVANCED_ROUTER
 
          If unsure, say N here.
 
-choice
-       prompt "Choose IP: FIB lookup algorithm (choose FIB_HASH if unsure)"
-       depends on IP_ADVANCED_ROUTER
-       default ASK_IP_FIB_HASH
-
-config ASK_IP_FIB_HASH
-       bool "FIB_HASH"
-       ---help---
-         Current FIB is very proven and good enough for most users.
-
-config IP_FIB_TRIE
-       bool "FIB_TRIE"
-       ---help---
-         Use new experimental LC-trie as FIB lookup algorithm.
-         This improves lookup performance if you have a large
-         number of routes.
-
-         LC-trie is a longest matching prefix lookup algorithm which
-         performs better than FIB_HASH for large routing tables.
-         But, it consumes more memory and is more complex.
-
-         LC-trie is described in:
-
-         IP-address lookup using LC-tries. Stefan Nilsson and Gunnar Karlsson
-         IEEE Journal on Selected Areas in Communications, 17(6):1083-1092,
-         June 1999
-
-         An experimental study of compression methods for dynamic tries
-         Stefan Nilsson and Matti Tikkanen. Algorithmica, 33(1):19-33, 2002.
-         <http://www.csc.kth.se/~snilsson/software/dyntrie2/>
-
-endchoice
-
-config IP_FIB_HASH
-       def_bool ASK_IP_FIB_HASH || !IP_ADVANCED_ROUTER
-
 config IP_FIB_TRIE_STATS
        bool "FIB TRIE statistics"
-       depends on IP_FIB_TRIE
+       depends on IP_ADVANCED_ROUTER
        ---help---
          Keep track of statistics on structure of FIB TRIE table.
          Useful for testing and measuring TRIE performance.
@@ -140,6 +104,9 @@ config IP_ROUTE_VERBOSE
          handled by the klogd daemon which is responsible for kernel messages
          ("man klogd").
 
+config IP_ROUTE_CLASSID
+       bool
+
 config IP_PNP
        bool "IP: kernel level autoconfiguration"
        help
@@ -657,4 +624,3 @@ config TCP_MD5SIG
          on the Internet.
 
          If unsure, say N.
-