From patchwork Tue Feb 24 13:00:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Galbraith X-Patchwork-Id: 23616 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.176.167]) by ozlabs.org (Postfix) with ESMTP id AEBEDDDE0A for ; Wed, 25 Feb 2009 00:00:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754459AbZBXNAg (ORCPT ); Tue, 24 Feb 2009 08:00:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754330AbZBXNAe (ORCPT ); Tue, 24 Feb 2009 08:00:34 -0500 Received: from mail.gmx.net ([213.165.64.20]:54545 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754221AbZBXNAd (ORCPT ); Tue, 24 Feb 2009 08:00:33 -0500 Received: (qmail invoked by alias); 24 Feb 2009 13:00:29 -0000 Received: from p5B09280D.dip0.t-ipconnect.de (EHLO [192.168.178.27]) [91.9.40.13] by mail.gmx.net (mp014) with SMTP; 24 Feb 2009 14:00:29 +0100 X-Authenticated: #14349625 X-Provags-ID: V01U2FsdGVkX1/5a+wQ8Hv5g+pTSIn3/IbkLIBY/cG9greqhdlcsW 1mwVyx+Y+bk5uP Subject: !CONFIG_NET_NS build error, net/core/net_namespace.c From: Mike Galbraith To: Daniel Lezcano Cc: David Miller , netdev , LKML Date: Tue, 24 Feb 2009 14:00:27 +0100 Message-Id: <1235480427.5965.22.camel@marge.simson.net> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1.1 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.5600000000000001 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org CC net/core/net_namespace.o net/core/net_namespace.c: In function ‘net_ns_init’: net/core/net_namespace.c:223: error: implicit declaration of function ‘net_alloc_generic’ net/core/net_namespace.c:223: warning: assignment makes pointer from integer without a cast make[2]: *** [net/core/net_namespace.o] Error 1 make[1]: *** [net/core] Error 2 make: *** [net] Error 2 Impact: fix !CONFIG_NET_NS net/core/net_namespace.c build error Signed-off-by: Mike Galbraith net/core/net_namespace.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- 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/core/net_namespace.c b/net/core/net_namespace.c index b0767ab..2adb1a7 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -63,10 +63,6 @@ out_undo: goto out; } -#ifdef CONFIG_NET_NS -static struct kmem_cache *net_cachep; -static struct workqueue_struct *netns_wq; - static struct net_generic *net_alloc_generic(void) { struct net_generic *ng; @@ -80,6 +76,10 @@ static struct net_generic *net_alloc_generic(void) return ng; } +#ifdef CONFIG_NET_NS +static struct kmem_cache *net_cachep; +static struct workqueue_struct *netns_wq; + static struct net *net_alloc(void) { struct net *net = NULL;