---

yaml --- r: 298756 b: refs/heads/master c: ca53e44 h: refs/heads/master v: v3
git-mirror · Apr 3, 2012 · d1cc186 · d1cc186
1 parent 5e2175d
commit d1cc186
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: 9b461783d3d49c74665b55b8ae1b7a1c038177a9
+refs/heads/master: ca53e4405347a1e19eaf59c757ceaaaa1a784758
diff --git a/trunk/net/netfilter/xt_CT.c b/trunk/net/netfilter/xt_CT.c
@@ -261,7 +261,7 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
 				goto err4;
 			}
 			timeout_ext = nf_ct_timeout_ext_add(ct, timeout,
-							    GFP_KERNEL);
+							    GFP_ATOMIC);
 			if (timeout_ext == NULL) {
 				ret = -ENOMEM;
 				goto err4;