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 estimation_timer

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

6
net/netfilter/ipvs/ip_vs_est.c
View file

@ -102,10 +102,8 @@ static void estimation_timer(unsigned long arg)
struct ip_vs_estimator *e; struct ip_vs_estimator *e;
struct ip_vs_stats *s; struct ip_vs_stats *s;
u64 rate; u64 rate;
struct net *net = (struct net *)arg; struct netns_ipvs *ipvs = (struct netns_ipvs *)arg;
struct netns_ipvs *ipvs;
ipvs = net_ipvs(net);
spin_lock(&ipvs->est_lock); spin_lock(&ipvs->est_lock);
list_for_each_entry(e, &ipvs->est_list, list) { list_for_each_entry(e, &ipvs->est_list, list) {
s = container_of(e, struct ip_vs_stats, est); s = container_of(e, struct ip_vs_stats, est);
@ -196,7 +194,7 @@ int __net_init ip_vs_estimator_net_init(struct net *net)
INIT_LIST_HEAD(&ipvs->est_list); INIT_LIST_HEAD(&ipvs->est_list);
spin_lock_init(&ipvs->est_lock); spin_lock_init(&ipvs->est_lock);
setup_timer(&ipvs->est_timer, estimation_timer, (unsigned long)net); setup_timer(&ipvs->est_timer, estimation_timer, (unsigned long)ipvs);
mod_timer(&ipvs->est_timer, jiffies + 2 * HZ); mod_timer(&ipvs->est_timer, jiffies + 2 * HZ);
return 0; return 0;
} }