2.6.25-rc7

 net

 ipv4

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 9f9fd2c..9c7e5ff 100644
--- 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_AUTHENC
    select CRYPTO_HMAC
    select CRYPTO_MD5
    select CRYPTO_CBC