---

yaml --- r: 322446 b: refs/heads/master c: ef6acf6 h: refs/heads/master v: v3
git-mirror · Aug 30, 2012 · d4155cc · d4155cc
1 parent 2d826d6
commit d4155cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a54e939d8c2647c711ef2369c3e73c3b7f3028c
+refs/heads/master: ef6acf68c259d907517dcc0ffefcd4e30276ae29
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -2790,7 +2790,8 @@ static int __init ctnetlink_init(void)
 		goto err_unreg_subsys;
 	}
 
-	if (register_pernet_subsys(&ctnetlink_net_ops)) {
+	ret = register_pernet_subsys(&ctnetlink_net_ops);
+	if (ret < 0) {
 		pr_err("ctnetlink_init: cannot register pernet operations\n");
 		goto err_unreg_exp_subsys;
 	}