aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2005-11-09 16:01:19 -0500
committerDavid S. Miller <davem@davemloft.net>2005-11-09 16:01:19 -0500
commit81e5c27d08bb39e646fe822ea80ab8feba62b94d (patch)
tree3586319f81a56e69f27683535557ca6b65a6dafd /net
parent7a4fe3664b3cfecd2a40a46f54c71333639e28b7 (diff)
[NETFILTER] ctnetlink: get_conntrack can use GFP_KERNEL
ctnetlink_get_conntrack is always called from user context, so GFP_KERNEL is enough. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter/ip_conntrack_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index bf584249571a..d1dde1417ef7 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -779,7 +779,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
779 ct = tuplehash_to_ctrack(h); 779 ct = tuplehash_to_ctrack(h);
780 780
781 err = -ENOMEM; 781 err = -ENOMEM;
782 skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_ATOMIC); 782 skb2 = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
783 if (!skb2) { 783 if (!skb2) {
784 ip_conntrack_put(ct); 784 ip_conntrack_put(ct);
785 return -ENOMEM; 785 return -ENOMEM;