---

yaml --- r: 362279 b: refs/heads/master c: 5389090 h: refs/heads/master i: 362277: 6f8648d 362275: 074382d 362271: 7d4a45c v: v3
git-mirror · Mar 27, 2013 · 19e1e58 · 19e1e58
1 parent 576a9ed
commit 19e1e58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: deadcfc3324410726cd6a663fb4fc46be595abe7
+refs/heads/master: 5389090b59f7f72a30e25f5fd1fc560340543970
diff --git a/trunk/net/netfilter/nf_conntrack_standalone.c b/trunk/net/netfilter/nf_conntrack_standalone.c
@@ -568,6 +568,7 @@ static int __init nf_conntrack_standalone_init(void)
 		register_net_sysctl(&init_net, "net", nf_ct_netfilter_table);
 	if (!nf_ct_netfilter_header) {
 		pr_err("nf_conntrack: can't register to sysctl.\n");
+		ret = -ENOMEM;
 		goto out_sysctl;
 	}
 #endif