summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-07 21:13:06 +0100
committerDavid S. Miller <davem@davemloft.net>2012-01-07 21:13:06 +0100
commit6d62a66e4211546f9e5c5d1ad586749a51cf30db (patch)
tree3d258aa96a35435ec4a372a9ffe016161a66db8e /net/ipv4
parentr6040: fix typo in use of MCR0 register bits (diff)
downloadlinux-6d62a66e4211546f9e5c5d1ad586749a51cf30db.tar.xz
linux-6d62a66e4211546f9e5c5d1ad586749a51cf30db.zip
net: Default UDP and UNIX diag to 'n'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/Kconfig6
1 files changed, 5 insertions, 1 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
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"