From patchwork Tue Feb 7 13:37:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Emelyanov X-Patchwork-Id: 139929 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 479431007D3 for ; Wed, 8 Feb 2012 00:38:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756005Ab2BGNiD (ORCPT ); Tue, 7 Feb 2012 08:38:03 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:12495 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755965Ab2BGNiC (ORCPT ); Tue, 7 Feb 2012 08:38:02 -0500 Received: from [10.30.19.237] ([10.30.19.237]) (authenticated bits=0) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q17Dbqje000136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 7 Feb 2012 17:37:53 +0400 (MSK) Message-ID: <4F31292F.2090503@parallels.com> Date: Tue, 07 Feb 2012 17:37:51 +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: Anisse Astier CC: David Miller , "netdev@vger.kernel.org" , Eric Dumazet Subject: Re: [PATCH] net: Default UDP and UNIX diag to 'n'. References: <20120107.121339.633839797125273714.davem@davemloft.net> <20120207121256.50667809@destiny.ordissimo> In-Reply-To: <20120207121256.50667809@destiny.ordissimo> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org >> 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. >> I assume you have CONFIG_IPV6=m and CONFIG_INET_UDP_DIAG=y, right? This one should fix the issue, you'll not be able to set it to Y when IPV6 is M. [PATCH] udp_diag: Add dependency on IPV6 Signed-off-by: Pavel Emelyanov --- 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 aa2a2c7..55d39a4 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -409,7 +409,7 @@ config INET_TCP_DIAG config INET_UDP_DIAG tristate "UDP: socket monitoring interface" - depends on INET_DIAG + depends on INET_DIAG && IPV6 default n ---help--- Support for UDP socket monitoring interface used by the ss tool.