summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSasha Levin <levinsasha928@gmail.com>2012-04-14 12:37:47 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2012-05-08 19:38:22 +0200
commit9615e61e6f23f18fc192ed44735725bb5b500bad (patch)
tree19a820b7b361647b1e24ed590f49c02d639e6b95 /net
parentd6318f08e8d0b95960f74280cdaa7f0e00fd604c (diff)
downloadop-kernel-dev-9615e61e6f23f18fc192ed44735725bb5b500bad.zip
op-kernel-dev-9615e61e6f23f18fc192ed44735725bb5b500bad.tar.gz
ipvs: use GFP_KERNEL allocation where possible
Use GFP_KERNEL instead of GFP_ATOMIC when registering an ipvs protocol. This is safe since it will always run from a process context. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipvs/ip_vs_proto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index ca164761..e91c898 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -68,7 +68,7 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp)
struct netns_ipvs *ipvs = net_ipvs(net);
unsigned int hash = IP_VS_PROTO_HASH(pp->protocol);
struct ip_vs_proto_data *pd =
- kzalloc(sizeof(struct ip_vs_proto_data), GFP_ATOMIC);
+ kzalloc(sizeof(struct ip_vs_proto_data), GFP_KERNEL);
if (!pd)
return -ENOMEM;
OpenPOWER on IntegriCloud