aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2011-12-09 23:33:43 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-10 13:14:59 -0500
commitb872a2371ffd13e6d83423ef621a707df4c158ac (patch)
tree0191706b7ebc7e837513d56629c06556b0f7a1dd /net/ipv4
parentudp_diag: Wire the udp_diag module into kbuild (diff)
downloadlinux-dev-b872a2371ffd13e6d83423ef621a707df4c158ac.tar.xz
linux-dev-b872a2371ffd13e6d83423ef621a707df4c158ac.zip
udp_diag: Make it module when ipv6 is a module
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>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index a51e33e64552..1a8f93bd2d4f 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"