Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh

[linux-2.6] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 1bbc3689cd8a8642fda5a1c70053a6bcc476df73..5572071af735ea7716143752bfad35ea969e65b6 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -64,7 +64,7 @@ config ASK_IP_FIB_HASH
 config IP_FIB_TRIE
        bool "FIB_TRIE"
        ---help---
-       Use new experimental LC-trie as FIB lookup algoritm. 
+       Use new experimental LC-trie as FIB lookup algorithm. 
         This improves lookup performance if you have a large
        number of routes.
 
@@ -434,6 +434,15 @@ config INET_XFRM_MODE_TUNNEL
 
          If unsure, say Y.
 
+config INET_XFRM_MODE_BEET
+       tristate "IP: IPsec BEET mode"
+       default y
+       select XFRM
+       ---help---
+         Support for IPsec BEET mode.
+
+         If unsure, say Y.
+
 config INET_DIAG
        tristate "INET: socket monitoring interface"
        default y
@@ -455,7 +464,7 @@ menuconfig TCP_CONG_ADVANCED
          modules.
 
          Nearly all users can safely say no here, and a safe default
-         selection will be made (BIC-TCP with new Reno as a fallback).
+         selection will be made (CUBIC with new Reno as a fallback).
 
          If unsure, say N.
 
@@ -463,7 +472,7 @@ if TCP_CONG_ADVANCED
 
 config TCP_CONG_BIC
        tristate "Binary Increase Congestion (BIC) control"
-       default y
+       default m
        ---help---
        BIC-TCP is a sender-side only change that ensures a linear RTT
        fairness under large windows while offering both scalability and
@@ -477,7 +486,7 @@ config TCP_CONG_BIC
 
 config TCP_CONG_CUBIC
        tristate "CUBIC TCP"
-       default m
+       default y
        ---help---
        This is version 2.0 of BIC-TCP which uses a cubic growth function
        among other techniques.
@@ -526,7 +535,7 @@ config TCP_CONG_HYBLA
        ---help---
        TCP-Hybla is a sender-side only change that eliminates penalization of
        long-RTT, large-bandwidth connections, like when satellite legs are
-       involved, expecially when sharing a common bottleneck with normal
+       involved, especially when sharing a common bottleneck with normal
        terrestrial connections.
 
 config TCP_CONG_VEGAS
@@ -556,7 +565,7 @@ config TCP_CONG_LP
        default n
        ---help---
        TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
-       to utiliza only the excess network bandwidth as compared to the
+       to utilize only the excess network bandwidth as compared to the
        ``fair share`` of bandwidth as targeted by TCP.
        See http://www-ece.rice.edu/networks/TCP-LP/
 
@@ -574,7 +583,7 @@ config TCP_CONG_VENO
 
 choice
        prompt "Default TCP congestion control"
-       default DEFAULT_BIC
+       default DEFAULT_CUBIC
        help
          Select the TCP congestion control that will be used by default
          for all connections.
@@ -601,7 +610,7 @@ endchoice
 
 endif
 
-config TCP_CONG_BIC
+config TCP_CONG_CUBIC
        tristate
        depends on !TCP_CONG_ADVANCED
        default y
@@ -614,7 +623,7 @@ config DEFAULT_TCP_CONG
        default "vegas" if DEFAULT_VEGAS
        default "westwood" if DEFAULT_WESTWOOD
        default "reno" if DEFAULT_RENO
-       default "bic"
+       default "cubic"
 
 source "net/ipv4/ipvs/Kconfig"