Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / ipv4 / Kconfig

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 335ca7a..aa2a2c7 100644 (file)
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -408,8 +408,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"