---

yaml --- r: 108843 b: refs/heads/master c: cb1cb5c h: refs/heads/master i: 108841: 5d3fd77 108839: c29f4b8 v: v3
git-mirror · Aug 19, 2008 · 783e114 · 783e114
1 parent 77f67d0
commit 783e114
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1575e7ea018fec992b94a12a1a491ce693ae9eac
+refs/heads/master: cb1cb5c47457ff2b604dac2da44cab4d39d11459
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -1139,7 +1139,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
 	rcu_read_lock();
 	helper = __nf_ct_helper_find(rtuple);
 	if (helper) {
-		help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
+		help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
 		if (help == NULL) {
 			rcu_read_unlock();
 			err = -ENOMEM;