summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2012-04-13 13:49:38 (GMT)
committerPablo Neira Ayuso <pablo@netfilter.org>2012-05-08 17:37:28 (GMT)
commitd6318f08e8d0b95960f74280cdaa7f0e00fd604c (patch)
treed8153d550fc8894b2e8cbcac3bca36bcbef76b85 /net
parent45d4e71a39c3274f982d73688cbee2a4b286c3e3 (diff)
downloadlinux-d6318f08e8d0b95960f74280cdaa7f0e00fd604c.tar.xz
ipvs: SH scheduler does not need GFP_ATOMIC allocation
Schedulers are initialized and bound to services only on commands. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Hans Schillstrom <hans@schillstrom.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipvs/ip_vs_sh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index 91e97ee..0512652 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -162,7 +162,7 @@ static int ip_vs_sh_init_svc(struct ip_vs_service *svc)
/* allocate the SH table for this service */
tbl = kmalloc(sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE,
- GFP_ATOMIC);
+ GFP_KERNEL);
if (tbl == NULL)
return -ENOMEM;