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_sync_conn_v0

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:16 -05:00 • committed by Simon Horman
parent 7d537f3ab7
commit 72e9481e28
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/netfilter/ipvs/ip_vs_sync.c
View file

@ -533,10 +533,9 @@ set:
* Version 0 , could be switched in by sys_ctl. * Version 0 , could be switched in by sys_ctl.
* Add an ip_vs_conn information into the current sync_buff. * Add an ip_vs_conn information into the current sync_buff.
*/ */
static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp, static void ip_vs_sync_conn_v0(struct netns_ipvs *ipvs, struct ip_vs_conn *cp,
int pkts) int pkts)
{ {
struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_sync_mesg_v0 *m; struct ip_vs_sync_mesg_v0 *m;
struct ip_vs_sync_conn_v0 *s; struct ip_vs_sync_conn_v0 *s;
struct ip_vs_sync_buff *buff; struct ip_vs_sync_buff *buff;
@ -615,7 +614,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
pkts = atomic_add_return(1, &cp->in_pkts); pkts = atomic_add_return(1, &cp->in_pkts);
else else
pkts = sysctl_sync_threshold(ipvs); pkts = sysctl_sync_threshold(ipvs);
ip_vs_sync_conn(net, cp, pkts); ip_vs_sync_conn(ipvs->net, cp, pkts);
} }
} }
@ -637,7 +636,7 @@ void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp, int pkts)
/* Handle old version of the protocol */ /* Handle old version of the protocol */
if (sysctl_sync_ver(ipvs) == 0) { if (sysctl_sync_ver(ipvs) == 0) {
ip_vs_sync_conn_v0(net, cp, pkts); ip_vs_sync_conn_v0(ipvs, cp, pkts);
return; return;
} }
/* Do not sync ONE PACKET */ /* Do not sync ONE PACKET */