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

login
register
mail settings
Submitter David Miller
Date Jan. 7, 2012, 8:13 p.m.
Message ID <20120107.121339.633839797125273714.davem@davemloft.net>
Download mbox | patch
Permalink /patch/134865/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Jan. 7, 2012, 8:13 p.m.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/ipv4/Kconfig |    6 +++++-
 net/unix/Kconfig |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
Anisse Astier - Feb. 7, 2012, 11:12 a.m.
Hi,

On Sat, 07 Jan 2012 12:13:39 -0800 (PST), David Miller <davem@davemloft.net> wrote :

> 
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  net/ipv4/Kconfig |    6 +++++-
>  net/unix/Kconfig |    2 +-
>  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
This broke earlier patch 
b872a2371ffd13e6d83423ef621a707df4c158ac "udp_diag: Make it module when ipv6 is a module",
which brings back the compilation error when compiling linus master (v3.3-rc2+):

net/built-in.o: In function `udp_dump_one':
udp_diag.c:(.text+0x59852): undefined reference to `__udp6_lib_lookup'


> +	default n
> +	---help---
> +	  Support for UDP socket monitoring interface used by the ss tool.
> +	  If unsure, say Y.
>  

Regards,

Anisse
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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 c2128b1..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.