From patchwork Sat Dec 10 09:33:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Emelyanov X-Patchwork-Id: 130515 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4B6021007D7 for ; Sat, 10 Dec 2011 20:34:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752543Ab1LJJdy (ORCPT ); Sat, 10 Dec 2011 04:33:54 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:21931 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752117Ab1LJJdx (ORCPT ); Sat, 10 Dec 2011 04:33:53 -0500 Received: from [10.24.20.94] ([10.24.20.94]) (authenticated bits=0) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id pBA9Xi8o008901 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 10 Dec 2011 12:33:45 +0300 (MSK) Message-ID: <4EE32777.2030003@parallels.com> Date: Sat, 10 Dec 2011 13:33:43 +0400 From: Pavel Emelyanov User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc15 Thunderbird/3.1.10 MIME-Version: 1.0 To: Eric Dumazet CC: David Miller , Linux Netdev List Subject: [PATCH 1/2] udp_diag: Make it module when ipv6 is a module References: <4EE23561.5020804@parallels.com> <4EE23626.6000104@parallels.com> <1323467297.4016.10.camel@edumazet-laptop> <4EE32167.2080202@parallels.com> In-Reply-To: <4EE32167.2080202@parallels.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Pavel Emelyanov Acked-by: Eric Dumazet --- -- 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 --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"