Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[mv-sheeva.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 30af4a4dfcc82cb7d0f0646faa9be67c77ef24cc..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
@@ -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/