From: David S. Miller <davem@davemloft.net>
Date: Sat, 7 Jan 2012 20:13:06 +0000 (-0800)
Subject: net: Default UDP and UNIX diag to 'n'.
X-Git-Tag: v3.3-rc1~134^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d62a66e4211546f9e5c5d1ad586749a51cf30db;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 1a8f93b..43e1439 100644
--- 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
index c2128b1..8b31ab8 100644
--- 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.