Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index d894f616c3d63ce732073d90f185441f3411da75..19880b086e712f4e29932debfdc0b06714fef6e7 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -85,6 +85,13 @@ 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
+       ---help---
+         Keep track of statistics on structure of FIB TRIE table.
+         Useful for testing and measuring TRIE performance.
+
 config IP_MULTIPLE_TABLES
        bool "IP: policy routing"
        depends on IP_ADVANCED_ROUTER
@@ -336,6 +343,7 @@ config INET_ESP
        tristate "IP: ESP transformation"
        select XFRM
        select CRYPTO
+       select CRYPTO_AEAD
        select CRYPTO_HMAC
        select CRYPTO_MD5
        select CRYPTO_CBC
@@ -560,7 +568,7 @@ config TCP_CONG_ILLINOIS
        depends on EXPERIMENTAL
        default n
        ---help---
-       TCP-Illinois is a sender-side modificatio of TCP Reno for
+       TCP-Illinois is a sender-side modification of TCP Reno for
        high speed long delay links. It uses round-trip-time to
        adjust the alpha and beta parameters to achieve a higher average
        throughput and maintain fairness.