summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-07 12:13:06 -0800
committerDavid S. Miller <davem@davemloft.net>2012-01-07 12:13:06 -0800
commit6d62a66e4211546f9e5c5d1ad586749a51cf30db (patch)
tree3d258aa96a35435ec4a372a9ffe016161a66db8e
parent77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75 (diff)
downloadop-kernel-dev-6d62a66e4211546f9e5c5d1ad586749a51cf30db.zip
op-kernel-dev-6d62a66e4211546f9e5c5d1ad586749a51cf30db.tar.gz
net: Default UDP and UNIX diag to 'n'.
Signed-off-by: David S. Miller <davem@davemloft.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 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 c2128b10..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.
OpenPOWER on IntegriCloud