projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a4fe36
)
[NETFILTER] ctnetlink: get_conntrack can use GFP_KERNEL
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 9 Nov 2005 21:01:19 +0000
(13:01 -0800)
committer
David S. Miller
<davem@davemloft.net>
Wed, 9 Nov 2005 21:01:19 +0000
(13:01 -0800)
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>
net/ipv4/netfilter/ip_conntrack_netlink.c
patch
|
blob
|
history
diff --git
a/net/ipv4/netfilter/ip_conntrack_netlink.c
b/net/ipv4/netfilter/ip_conntrack_netlink.c
index bf584249571a61d6f6c76ddba7522b8ec2cd5d03..d1dde1417ef7d049175473648d84a667fee837cc 100644
(file)
--- 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;