From 36cb1882960aa1f8c03fbb57325367b0c4d92b4f Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 18 Aug 2008 21:31:46 -0700
Subject: [PATCH] --- yaml --- r: 108844 b: refs/heads/master c:
 fab00c5d15091546be681426c60b2ed2c10513bf h: refs/heads/master 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 c3feab902804..1c6d10c04f3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb1cb5c47457ff2b604dac2da44cab4d39d11459
+refs/heads/master: fab00c5d15091546be681426c60b2ed2c10513bf
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
index a5b95ccb3ce7..a8752031adcb 100644
--- a/trunk/net/netfilter/nf_conntrack_netlink.c
+++ b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -968,7 +968,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[])
 		/* need to zero data of old helper */
 		memset(&help->help, 0, sizeof(help->help));
 	} else {
-		help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
+		help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
 		if (help == NULL)
 			return -ENOMEM;
 	}