summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2012-04-13 16:49:40 +0300
committerPablo Neira Ayuso <pablo@netfilter.org>2012-05-08 19:37:17 +0200
commit748d845ca9cf0e7c7692ec45e4d8cb3a90b31793 (patch)
treee2f44e8b4723796e6d01b1a7aed0a8f9b8d17a5e /net
parent41cff6d5c924eb51704dd6928687fd0494e6c744 (diff)
downloadlinux-3.10-748d845ca9cf0e7c7692ec45e4d8cb3a90b31793.tar.gz
linux-3.10-748d845ca9cf0e7c7692ec45e4d8cb3a90b31793.tar.bz2
linux-3.10-748d845ca9cf0e7c7692ec45e4d8cb3a90b31793.zip
ipvs: LBLC scheduler does not need GFP_ATOMIC allocation on init
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_lblc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index 9b0de9a0e08..df646ccf08a 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -342,7 +342,7 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc)
/*
* Allocate the ip_vs_lblc_table for this service
*/
- tbl = kmalloc(sizeof(*tbl), GFP_ATOMIC);
+ tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
if (tbl == NULL)
return -ENOMEM;