evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipvs: Pass ipvs not net to __ip_vs_get_service_entries

Browse source 
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:03 -05:00 • committed by Simon Horman
parent f1faa1e749
commit b2876b7773
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/netfilter/ipvs/ip_vs_ctl.c
View file

@ -2477,11 +2477,10 @@ ip_vs_copy_service(struct ip_vs_service_entry *dst, struct ip_vs_service *src)
} }
static inline int static inline int
__ip_vs_get_service_entries(struct net *net, __ip_vs_get_service_entries(struct netns_ipvs *ipvs,
const struct ip_vs_get_services *get, const struct ip_vs_get_services *get,
struct ip_vs_get_services __user *uptr) struct ip_vs_get_services __user *uptr)
{ {
struct netns_ipvs *ipvs = net_ipvs(net);
int idx, count=0; int idx, count=0;
struct ip_vs_service *svc; struct ip_vs_service *svc;
struct ip_vs_service_entry entry; struct ip_vs_service_entry entry;
@ -2720,7 +2719,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
ret = __ip_vs_get_service_entries(net, get, user); ret = __ip_vs_get_service_entries(ipvs, get, user);
} }
break; break;