diff options
| author | Clemens Noss <cnoss@gmx.de> | 2009-02-23 15:37:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-23 15:37:35 -0800 |
| commit | ebe47d47b7b7fed72dabcce4717da727b4e2367d (patch) | |
| tree | e871bc6f687e62a5c34d8f63a92fb6abf0462547 /net | |
| parent | 486a87f1e5624096bd1c09e9e716239597d48dca (diff) | |
| download | linux-ebe47d47b7b7fed72dabcce4717da727b4e2367d.tar.bz2 | |
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>
Diffstat (limited to '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: 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; |