Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe47d47 authored by Clemens Noss's avatar Clemens Noss Committed by David S. Miller
Browse files

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: default avatarClemens Noss <cnoss@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 486a87f1

net/core/net_namespace.c

+4 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ static __net_init int setup_net(struct net *net) 
	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;