Patchwork net: Fix build without CONFIG_NET_NS

login
register
mail settings
Submitter Benjamin Herrenschmidt
Date Feb. 24, 2009, 2:26 a.m.
Message ID <20090224022734.1766BDDE1D@ozlabs.org>
Download mbox | patch
Permalink /patch/23590/
State Accepted
Delegated to: David Miller
Headers show

Comments

Benjamin Herrenschmidt - Feb. 24, 2009, 2:26 a.m.
Commit 486a87f1e5624096bd1c09e9e716239597d48dca broke build without
CONFIG_NET_NS due to calling net_alloc_generic() always while defining
it inside an #ifdef CONFIG_NET_NS block. This moves the function
definition out of that block.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

 net/core/net_namespace.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 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

Patch

--- linux-work.orig/net/core/net_namespace.c	2009-02-24 13:20:42.000000000 +1100
+++ linux-work/net/core/net_namespace.c	2009-02-24 13:24:19.000000000 +1100
@@ -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_gen
 	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;
@@ -218,7 +218,7 @@  static int __init net_ns_init(void)
 	netns_wq = create_singlethread_workqueue("netns");
 	if (!netns_wq)
 		panic("Could not create netns workq");
-#endif
+#endif /* CONFIG_NET_NS */
 
 	ng = net_alloc_generic();
 	if (!ng)