aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-07 15:13:06 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-07 15:13:06 -0500
commit6d62a66e4211546f9e5c5d1ad586749a51cf30db (patch)
tree3d258aa96a35435ec4a372a9ffe016161a66db8e /net
parent77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75 (diff)
net: Default UDP and UNIX diag to 'n'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/Kconfig6
-rw-r--r--net/unix/Kconfig2
2 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 1a8f93bd2d4f..43e1439e75e6 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -410,8 +410,12 @@ config INET_TCP_DIAG
410 def_tristate INET_DIAG 410 def_tristate INET_DIAG
411 411
412config INET_UDP_DIAG 412config INET_UDP_DIAG
413 tristate "UDP: socket monitoring interface"
413 depends on INET_DIAG 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
416menuconfig TCP_CONG_ADVANCED 420menuconfig TCP_CONG_ADVANCED
417 bool "TCP: advanced congestion control" 421 bool "TCP: advanced congestion control"
diff --git a/net/unix/Kconfig b/net/unix/Kconfig
index c2128b10e5f9..8b31ab85d050 100644
--- a/net/unix/Kconfig
+++ b/net/unix/Kconfig
@@ -22,7 +22,7 @@ config UNIX
22config UNIX_DIAG 22config UNIX_DIAG
23 tristate "UNIX: socket monitoring interface" 23 tristate "UNIX: socket monitoring interface"
24 depends on UNIX 24 depends on UNIX
25 default UNIX 25 default n
26 ---help--- 26 ---help---
27 Support for UNIX socket monitoring interface used by the ss tool. 27 Support for UNIX socket monitoring interface used by the ss tool.
28 If unsure, say Y. 28 If unsure, say Y.