diff options
| author |   Julian Anastasov <ja@ssi.bg> | 2012-04-13 16:49:42 +0300 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2012-05-08 19:37:22 +0200 |
| commit | 4f2a94dcb65bcdf20d91d5bffd29b9c836559d17 (patch) | |
| tree | 1d44e20c8a3482abde9dcc5cc3ef0e2966a3a879 /net/netfilter | |
| parent | ipvs: DH scheduler does not need GFP_ATOMIC allocation (diff) | |
| download | linux-dev-4f2a94dcb65bcdf20d91d5bffd29b9c836559d17.tar.xz linux-dev-4f2a94dcb65bcdf20d91d5bffd29b9c836559d17.zip | |
ipvs: WRR 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/netfilter')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_wrr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c index fd0d4e09876a..231be7dd547a 100644 --- a/net/netfilter/ipvs/ip_vs_wrr.c +++ b/net/netfilter/ipvs/ip_vs_wrr.c @@ -84,7 +84,7 @@ static int ip_vs_wrr_init_svc(struct ip_vs_service *svc) /* * Allocate the mark variable for WRR scheduling */ - mark = kmalloc(sizeof(struct ip_vs_wrr_mark), GFP_ATOMIC); + mark = kmalloc(sizeof(struct ip_vs_wrr_mark), GFP_KERNEL); if (mark == NULL) return -ENOMEM; |