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

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

net: Default UDP and UNIX diag to 'n'.
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller
1 parent 77e1e438cb
Showing 2 changed files with 6 additions and 2 deletions Side-by-side Diff
net/ipv4/Kconfig
net/unix/Kconfig
@@ -410,8 +410,12 @@
 	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"
@@ -22,7 +22,7 @@
 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.
...	...	@@ -410,8 +410,12 @@
410	410	def_tristate INET_DIAG
411	411
412	412	config INET_UDP_DIAG
	413	+ tristate "UDP: socket monitoring interface"
413	414	depends on INET_DIAG
414		- def_tristate INET_DIAG && IPV6
	415	+ default n
	416	+ ---help---
	417	+ Support for UDP socket monitoring interface used by the ss tool.
	418	+ If unsure, say Y.
415	419
416	420	menuconfig TCP_CONG_ADVANCED
417	421	bool "TCP: advanced congestion control"
...	...	@@ -22,7 +22,7 @@
22	22	config UNIX_DIAG
23	23	tristate "UNIX: socket monitoring interface"
24	24	depends on UNIX
25		- default UNIX
	25	+ default n
26	26	---help---
27	27	Support for UNIX socket monitoring interface used by the ss tool.
28	28	If unsure, say Y.