udp_diag: Make it module when ipv6 is a module
authorPavel Emelyanov <xemul@parallels.com>
Fri, 9 Dec 2011 23:33:43 +0000 (23:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 10 Dec 2011 18:14:59 +0000 (13:14 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/Kconfig

index a51e33e645529d030e5520dfd78d7253e8f238ee..1a8f93bd2d4f9c4bb0eeb44c640d88317d333ecd 100644 (file)
@@ -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"