---

yaml --- r: 281961 b: refs/heads/master c: 6d62a66 h: refs/heads/master i: 281959: 8d7e659 v: v3
git-mirror · Jan 7, 2012 · 4c6a7e2 · 4c6a7e2
1 parent 3ea316c
commit 4c6a7e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75
+refs/heads/master: 6d62a66e4211546f9e5c5d1ad586749a51cf30db
diff --git a/trunk/net/ipv4/Kconfig b/trunk/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/trunk/net/unix/Kconfig b/trunk/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.