diff --git a/[refs] b/[refs]
index eb53c8712b71..79b1895c57fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f7a2bb4eff75c56a71b3896c36a34e787c5e4e5
+refs/heads/master: ca0f31125c5cf0d48f47c2e1a3785a08876a7e87
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
index 69d7549db9a2..b7292a2719dc 100644
--- a/trunk/net/core/net_namespace.c
+++ b/trunk/net/core/net_namespace.c
@@ -196,7 +196,6 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 static int __init net_ns_init(void)
 {
 	struct net_generic *ng;
-	int err;
 
 #ifdef CONFIG_NET_NS
 	net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
@@ -216,15 +215,14 @@ static int __init net_ns_init(void)
 	rcu_assign_pointer(init_net.gen, ng);
 
 	mutex_lock(&net_mutex);
-	err = setup_net(&init_net);
+	if (setup_net(&init_net))
+		panic("Could not setup the initial network namespace");
 
 	rtnl_lock();
 	list_add_tail(&init_net.list, &net_namespace_list);
 	rtnl_unlock();
 
 	mutex_unlock(&net_mutex);
-	if (err)
-		panic("Could not setup the initial network namespace");
 
 	return 0;
 }