From 6aaa6a081d23c0c98dd8739b65136842e06d394a Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 9 Nov 2005 13:01:19 -0800
Subject: [PATCH] --- yaml --- r: 13644 b: refs/heads/master c:
 81e5c27d08bb39e646fe822ea80ab8feba62b94d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 90cf8fe489e5..8c4ecc546f13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a4fe3664b3cfecd2a40a46f54c71333639e28b7
+refs/heads/master: 81e5c27d08bb39e646fe822ea80ab8feba62b94d
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
index bf584249571a..d1dde1417ef7 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -779,7 +779,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
 	ct = tuplehash_to_ctrack(h);
 
 	err = -ENOMEM;
-	skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC);
+	skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
 	if (!skb2) {
 		ip_conntrack_put(ct);
 		return -ENOMEM;