projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f1faa1e
)
ipvs: Pass ipvs not net to __ip_vs_get_service_entries
author
Eric W. Biederman
<ebiederm@xmission.com>
Mon, 21 Sep 2015 18:02:03 +0000
(13:02 -0500)
committer
Simon Horman
<horms@verge.net.au>
Thu, 24 Sep 2015 00:34:36 +0000
(09:34 +0900)
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>
net/netfilter/ipvs/ip_vs_ctl.c
patch
|
blob
|
history
diff --git
a/net/netfilter/ipvs/ip_vs_ctl.c
b/net/netfilter/ipvs/ip_vs_ctl.c
index 7aba55c875cb624fc9ad6040185c31193d28a532..05f7e1d147381b082610b981fce4caec5553782c 100644
(file)
--- a/
net/netfilter/ipvs/ip_vs_ctl.c
+++ b/
net/netfilter/ipvs/ip_vs_ctl.c
@@
-2477,11
+2477,10
@@
ip_vs_copy_service(struct ip_vs_service_entry *dst, struct ip_vs_service *src)
}
static inline int
-__ip_vs_get_service_entries(struct net
*net
,
+__ip_vs_get_service_entries(struct net
ns_ipvs *ipvs
,
const struct ip_vs_get_services *get,
struct ip_vs_get_services __user *uptr)
{
- struct netns_ipvs *ipvs = net_ipvs(net);
int idx, count=0;
struct ip_vs_service *svc;
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;
goto out;
}
- ret = __ip_vs_get_service_entries(
net
, get, user);
+ ret = __ip_vs_get_service_entries(
ipvs
, get, user);
}
break;