upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 27f47ba..bd15e1a 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -301,6 +301,7 @@ config SYN_COOKIES
 
 config INET_AH
        tristate "IP: AH transformation"
+       depends on INET
        select XFRM
        select CRYPTO
        select CRYPTO_HMAC
@@ -313,6 +314,7 @@ config INET_AH
 
 config INET_ESP
        tristate "IP: ESP transformation"
+       depends on INET
        select XFRM
        select CRYPTO
        select CRYPTO_HMAC
@@ -326,18 +328,20 @@ config INET_ESP
 
 config INET_IPCOMP
        tristate "IP: IPComp transformation"
+       depends on INET
        select XFRM
        select INET_TUNNEL
        select CRYPTO
        select CRYPTO_DEFLATE
        ---help---
-         Support for IP Paylod Compression (RFC3173), typically needed
-         for IPsec.
+         Support for IP Payload Compression Protocol (IPComp) (RFC3173),
+         typically needed for IPsec.
          
          If unsure, say Y.
 
 config INET_TUNNEL
        tristate "IP: tunnel transformation"
+       depends on INET
        select XFRM
        ---help---
          Support for generic IP tunnel transformation, which is required by
@@ -368,6 +372,19 @@ config ACCEPT_QUEUES
 
          If unsure, say N.
 
+config IP_TCPDIAG
+       tristate "IP: TCP socket monitoring interface"
+       depends on INET
+       default y
+       ---help---
+         Support for TCP socket monitoring interface used by native Linux
+         tools such as ss.
+         
+         If unsure, say Y.
+
+config IP_TCPDIAG_IPV6
+       def_bool (IP_TCPDIAG=y && IPV6=y) || (IP_TCPDIAG=m && IPV6)
+
 source "net/ipv4/ipvs/Kconfig"
 
 #