diff mbox

[1/2] udp_diag: Make it module when ipv6 is a module

Message ID 4EE32777.2030003@parallels.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Pavel Emelyanov Dec. 10, 2011, 9:33 a.m. UTC
Eric Dumazet reported, that when inet_diag is built-in the udp_diag also goes
built-in and when ipv6 is a module the udp6 lookup symbol is not found.

  LD      .tmp_vmlinux1
net/built-in.o: In function `udp_dump_one':
udp_diag.c:(.text+0xa2b40): undefined reference to `__udp6_lib_lookup'
make: *** [.tmp_vmlinux1] Erreur 1

Fix this by making udp diag build mode depend on both -- inet diag and ipv6.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

---

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

Comments

Eric Dumazet Dec. 10, 2011, 11 a.m. UTC | #1
Le samedi 10 décembre 2011 à 13:33 +0400, Pavel Emelyanov a écrit :
> Eric Dumazet reported, that when inet_diag is built-in the udp_diag also goes
> built-in and when ipv6 is a module the udp6 lookup symbol is not found.
> 
>   LD      .tmp_vmlinux1
> net/built-in.o: In function `udp_dump_one':
> udp_diag.c:(.text+0xa2b40): undefined reference to `__udp6_lib_lookup'
> make: *** [.tmp_vmlinux1] Erreur 1
> 
> Fix this by making udp diag build mode depend on both -- inet diag and ipv6.
> 
> Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
> 
> ---
> 
> diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
> index a51e33e..1a8f93b 100644
> --- a/net/ipv4/Kconfig
> +++ b/net/ipv4/Kconfig
> @@ -411,7 +411,7 @@ config INET_TCP_DIAG
>  
>  config INET_UDP_DIAG
>  	depends on INET_DIAG
> -	def_tristate INET_DIAG
> +	def_tristate INET_DIAG && IPV6
>  
>  menuconfig TCP_CONG_ADVANCED
>  	bool "TCP: advanced congestion control"

Thanks !

Acked-by: Eric Dumazet <eric.dumazet@gmail.com>


--
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
David Miller Dec. 10, 2011, 6:15 p.m. UTC | #2
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 10 Dec 2011 12:00:20 +0100

> Le samedi 10 décembre 2011 à 13:33 +0400, Pavel Emelyanov a écrit :
>> Eric Dumazet reported, that when inet_diag is built-in the udp_diag also goes
>> built-in and when ipv6 is a module the udp6 lookup symbol is not found.
>> 
>>   LD      .tmp_vmlinux1
>> net/built-in.o: In function `udp_dump_one':
>> udp_diag.c:(.text+0xa2b40): undefined reference to `__udp6_lib_lookup'
>> make: *** [.tmp_vmlinux1] Erreur 1
>> 
>> Fix this by making udp diag build mode depend on both -- inet diag and ipv6.
>> 
>> Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
>> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
...
> Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
> 

Applied.
--
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
diff mbox

Patch

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index a51e33e..1a8f93b 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -411,7 +411,7 @@  config INET_TCP_DIAG
 
 config INET_UDP_DIAG
 	depends on INET_DIAG
-	def_tristate INET_DIAG
+	def_tristate INET_DIAG && IPV6
 
 menuconfig TCP_CONG_ADVANCED
 	bool "TCP: advanced congestion control"