From 783e1148b8162deec1064cafaf2f8b1d2d5d23f8 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 18 Aug 2008 21:31:24 -0700
Subject: [PATCH] --- yaml --- r: 108843 b: refs/heads/master c:
 cb1cb5c47457ff2b604dac2da44cab4d39d11459 h: refs/heads/master i:   108841:
 5d3fd770253ba56415f380531e832eb142e43b68   108839:
 c29f4b8e49e0a5586cbbda54006e4fa841ade0e5 v: v3

---
 [refs]                                     | 2 +-
 trunk/net/netfilter/nf_conntrack_netlink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index de35f78013ff..c3feab902804 100644
--- 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
index d1fb2f8555e8..a5b95ccb3ce7 100644
--- 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;