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

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

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 1a8f93bd2d4f9c4bb0eeb44c640d88317d333ecd..43e1439e75e695fab622054bc48dd6d530f7f863 100644 (file)
--- 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 c2128b10e5f98fe3d4c409c1314247f67512ccfc..8b31ab85d050f7b5930d53db5d69b6949865df4e 100644 (file)
--- 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.