X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv4%2FKconfig;h=8fe95800fe8377d79acd18cf7f81827c3508ce2b;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=ab116cb70945a7064777b06a735da3a00310fd0d;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index ab116cb70..8fe95800f 100644
--- 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
@@ -345,5 +349,21 @@ config INET_TUNNEL
 	  
 	  If unsure, say Y.
 
+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. ss is included in iproute2, currently downloadable
+	  at <http://developer.osdl.org/dev/iproute2>. If you want IPv6 support
+	  and have selected IPv6 as a module, you need to build this as a
+	  module too.
+	  
+	  If unsure, say Y.
+
+config IP_TCPDIAG_IPV6
+	def_bool (IP_TCPDIAG=y && IPV6=y) || (IP_TCPDIAG=m && IPV6)
+
 source "net/ipv4/ipvs/Kconfig"