Merge git://git.infradead.org/mtd-2.6

[sfrench/cifs-2.6.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index da33393be45f3d2e4d964dcdb9dbde58e59a1d84..1650b64415aa8a41aba0a81fcb3b0d569285391a 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -88,6 +88,7 @@ config IP_FIB_HASH
 config IP_MULTIPLE_TABLES
        bool "IP: policy routing"
        depends on IP_ADVANCED_ROUTER
+       select FIB_RULES
        ---help---
          Normally, a router decides what to do with a received packet based
          solely on the packet's final destination address. If you say Y here,
@@ -386,6 +387,7 @@ config INET_ESP
        select CRYPTO
        select CRYPTO_HMAC
        select CRYPTO_MD5
+       select CRYPTO_CBC
        select CRYPTO_SHA1
        select CRYPTO_DES
        ---help---
@@ -572,16 +574,6 @@ config TCP_CONG_VENO
        loss packets.
        See http://www.ntu.edu.sg/home5/ZHOU0022/papers/CPFu03a.pdf
 
-config TCP_CONG_COMPOUND
-       tristate "TCP Compound"
-       depends on EXPERIMENTAL
-       default n
-       ---help---
-       TCP Compound is a sender-side only change to TCP that uses
-       a mixed Reno/Vegas approach to calculate the cwnd.
-       For further details look here:
-         ftp://ftp.research.microsoft.com/pub/tr/TR-2005-86.pdf
-
 endmenu
 
 config TCP_CONG_BIC