---

yaml --- r: 299955 b: refs/heads/master c: 39f618b h: refs/heads/master i: 299953: d61f924 299951: c899409 v: v3
git-mirror · Apr 26, 2012 · 1ead0d5 · 1ead0d5
1 parent 54e3fb4
commit 1ead0d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d08d71ce59438a6ef06be5db07966e0c144b74e
+refs/heads/master: 39f618b4fd95ae243d940ec64c961009c74e3333
diff --git a/trunk/net/netfilter/ipvs/ip_vs_core.c b/trunk/net/netfilter/ipvs/ip_vs_core.c
@@ -1924,6 +1924,7 @@ static int __net_init __ip_vs_init(struct net *net)
 control_fail:
 	ip_vs_estimator_net_cleanup(net);
 estimator_fail:
+	net->ipvs = NULL;
 	return -ENOMEM;
 }
 
@@ -1936,6 +1937,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
 	ip_vs_control_net_cleanup(net);
 	ip_vs_estimator_net_cleanup(net);
 	IP_VS_DBG(2, "ipvs netns %d released\n", net_ipvs(net)->gen);
+	net->ipvs = NULL;
 }
 
 static void __net_exit __ip_vs_dev_cleanup(struct net *net)