diff options
author | Clemens Noss <cnoss@gmx.de> | 2009-02-23 18:37:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-23 18:37:35 -0500 |
commit | ebe47d47b7b7fed72dabcce4717da727b4e2367d (patch) | |
tree | e871bc6f687e62a5c34d8f63a92fb6abf0462547 | |
parent | 486a87f1e5624096bd1c09e9e716239597d48dca (diff) |
netns: build fix for net_alloc_generic
net_alloc_generic was defined in #ifdef CONFIG_NET_NS, but used
unconditionally. Move net_alloc_generic out of #ifdef.
Signed-off-by: Clemens Noss <cnoss@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/net_namespace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index b0767abf23e5..2adb1a7d361f 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c | |||
@@ -63,10 +63,6 @@ out_undo: | |||
63 | goto out; | 63 | goto out; |
64 | } | 64 | } |
65 | 65 | ||
66 | #ifdef CONFIG_NET_NS | ||
67 | static struct kmem_cache *net_cachep; | ||
68 | static struct workqueue_struct *netns_wq; | ||
69 | |||
70 | static struct net_generic *net_alloc_generic(void) | 66 | static struct net_generic *net_alloc_generic(void) |
71 | { | 67 | { |
72 | struct net_generic *ng; | 68 | struct net_generic *ng; |
@@ -80,6 +76,10 @@ static struct net_generic *net_alloc_generic(void) | |||
80 | return ng; | 76 | return ng; |
81 | } | 77 | } |
82 | 78 | ||
79 | #ifdef CONFIG_NET_NS | ||
80 | static struct kmem_cache *net_cachep; | ||
81 | static struct workqueue_struct *netns_wq; | ||
82 | |||
83 | static struct net *net_alloc(void) | 83 | static struct net *net_alloc(void) |
84 | { | 84 | { |
85 | struct net *net = NULL; | 85 | struct net *net = NULL; |