---

yaml --- r: 13644 b: refs/heads/master c: 81e5c27 h: refs/heads/master v: v3
git-mirror · Nov 9, 2005 · 6aaa6a0 · 6aaa6a0
1 parent d18c217
commit 6aaa6a0
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: 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
@@ -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;