diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-24 02:08:33 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-24 02:08:33 +0200 |
| commit | f0b9ad5690ed96f95d91ca19fba2fb2894bae6f0 (patch) | |
| tree | d1b649e6f97ac0f1fc9864a296021c71cf69cd21 /net/netfilter/ipvs/ip_vs_wrr.c | |
| parent | 272e77de798362c31e6452a46a0e7d5b6aaeb550 (diff) | |
| download | kernel_samsung_smdk4412-migrate_3.2.zip kernel_samsung_smdk4412-migrate_3.2.tar.gz kernel_samsung_smdk4412-migrate_3.2.tar.bz2 | |
update network codemigrate_3.2
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_wrr.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_wrr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c index 1ef41f5..fd0d4e0 100644 --- a/net/netfilter/ipvs/ip_vs_wrr.c +++ b/net/netfilter/ipvs/ip_vs_wrr.c @@ -85,10 +85,9 @@ 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); - if (mark == NULL) { - pr_err("%s(): no memory\n", __func__); + if (mark == NULL) return -ENOMEM; - } + mark->cl = &svc->destinations; mark->cw = 0; mark->mw = ip_vs_wrr_max_weight(svc); |