From patchwork Tue Feb 7 17:39:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 139980 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 AF35FB6EF7 for ; Wed, 8 Feb 2012 04:39:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755998Ab2BGRjU (ORCPT ); Tue, 7 Feb 2012 12:39:20 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:50565 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752301Ab2BGRjU (ORCPT ); Tue, 7 Feb 2012 12:39:20 -0500 Received: by wics10 with SMTP id s10so5081329wic.19 for ; Tue, 07 Feb 2012 09:39:18 -0800 (PST) Received: by 10.180.99.100 with SMTP id ep4mr35761711wib.7.1328636358822; Tue, 07 Feb 2012 09:39:18 -0800 (PST) Received: from destiny.ordissimo (mar92-17-78-228-214-160.fbx.proxad.net. [78.228.214.160]) by mx.google.com with ESMTPS id ho4sm33554608wib.3.2012.02.07.09.39.17 (version=SSLv3 cipher=OTHER); Tue, 07 Feb 2012 09:39:18 -0800 (PST) Date: Tue, 7 Feb 2012 18:39:11 +0100 From: Anisse Astier To: David Miller Cc: xemul@parallels.com, netdev@vger.kernel.org, eric.dumazet@gmail.com Subject: Re: [PATCH] net: Default UDP and UNIX diag to 'n'. Message-ID: <20120207183911.4dd65ac8@destiny.ordissimo> In-Reply-To: <20120207.122931.1509587729423704935.davem@davemloft.net> References: <20120107.121339.633839797125273714.davem@davemloft.net> <20120207121256.50667809@destiny.ordissimo> <4F31292F.2090503@parallels.com> <20120207.122931.1509587729423704935.davem@davemloft.net> X-Mailer: Claws Mail 3.7.8 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, 07 Feb 2012 12:29:31 -0500 (EST), David Miller wrote : > From: Pavel Emelyanov > Date: Tue, 07 Feb 2012 17:37:51 +0400 > > > @@ -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 > > This needs to be something like "INET_DIAG && (IPV6 || IPV6=n)" Yes, this works better. This is the right solution. Tested-by: Anisse Astier --- 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..d183262 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 || IPV6=n) default n ---help--- Support for UDP socket monitoring interface used by the ss tool.