net: Default UDP and UNIX diag to 'n'.

Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Jan 7, 2012 · 6d62a66 · 6d62a66
1 parent 77e1e43
commit 6d62a66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
@@ -410,8 +410,12 @@ config INET_TCP_DIAG
 	def_tristate INET_DIAG
 
 config INET_UDP_DIAG
+	tristate "UDP: socket monitoring interface"
 	depends on INET_DIAG
-	def_tristate INET_DIAG && IPV6
+	default n
+	---help---
+	  Support for UDP socket monitoring interface used by the ss tool.
+	  If unsure, say Y.
 
 menuconfig TCP_CONG_ADVANCED
 	bool "TCP: advanced congestion control"

diff --git a/net/unix/Kconfig b/net/unix/Kconfig
@@ -22,7 +22,7 @@ config UNIX
 config UNIX_DIAG
 	tristate "UNIX: socket monitoring interface"
 	depends on UNIX
-	default UNIX
+	default n
 	---help---
 	  Support for UNIX socket monitoring interface used by the ss tool.
 	  If unsure, say Y.