diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 13:06:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 13:06:37 -0400 |
| commit | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (patch) | |
| tree | 1b10a35334ec660f8fe021ce9cdeb08bb65fc839 /net/netfilter/ipvs | |
| parent | 14a15d618743ebc4936fe03073bf0c75024d3a07 (diff) | |
| parent | 5b423f6a40a0327f9d40bc8b97ce9be266f74368 (diff) | |
| download | op-kernel-dev-0dcd5052c8543ef999bcd252cee50b7ae8111e89.zip op-kernel-dev-0dcd5052c8543ef999bcd252cee50b7ae8111e89.tar.gz | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'net/netfilter/ipvs')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 72bf32a..f51013c 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -1171,8 +1171,10 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, goto out_err; } svc->stats.cpustats = alloc_percpu(struct ip_vs_cpu_stats); - if (!svc->stats.cpustats) + if (!svc->stats.cpustats) { + ret = -ENOMEM; goto out_err; + } /* I'm the first user of the service */ atomic_set(&svc->usecnt, 0); |
