diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2005-11-09 22:01:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-09 22:01:19 +0100 |
| commit | 81e5c27d08bb39e646fe822ea80ab8feba62b94d (patch) | |
| tree | 3586319f81a56e69f27683535557ca6b65a6dafd /net/ipv4 | |
| parent | [NETFILTER] ctnetlink: kill unused includes (diff) | |
| download | linux-81e5c27d08bb39e646fe822ea80ab8feba62b94d.tar.xz linux-81e5c27d08bb39e646fe822ea80ab8feba62b94d.zip | |
[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/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 2 |
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, 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; |