diff --git a/[refs] b/[refs] index 710753bbf8be..fe7e130a0f12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a8891a0a419d43ea06c8ded0849f0820c6a873b +refs/heads/master: 32f0c4cbe495d121c09ed14d9c84f9e1b9574415 diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c index 0e0ca6d06fa5..6f71db8c4428 100644 --- a/trunk/net/core/net_namespace.c +++ b/trunk/net/core/net_namespace.c @@ -24,7 +24,7 @@ EXPORT_SYMBOL_GPL(init_net); static struct net *net_alloc(void) { - return kmem_cache_alloc(net_cachep, GFP_KERNEL); + return kmem_cache_zalloc(net_cachep, GFP_KERNEL); } static void net_free(struct net *net) @@ -90,7 +90,6 @@ static int setup_net(struct net *net) struct pernet_operations *ops; int error; - memset(net, 0, sizeof(struct net)); atomic_set(&net->count, 1); atomic_set(&net->use_count, 0);