mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
ipvs: Pass ipvs not net to estimation_timer
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:
parent
3d99376689
commit
70a131a2c8
1 changed files with 2 additions and 4 deletions
|
@ -102,10 +102,8 @@ static void estimation_timer(unsigned long arg)
|
|||
struct ip_vs_estimator *e;
|
||||
struct ip_vs_stats *s;
|
||||
u64 rate;
|
||||
struct net *net = (struct net *)arg;
|
||||
struct netns_ipvs *ipvs;
|
||||
struct netns_ipvs *ipvs = (struct netns_ipvs *)arg;
|
||||
|
||||
ipvs = net_ipvs(net);
|
||||
spin_lock(&ipvs->est_lock);
|
||||
list_for_each_entry(e, &ipvs->est_list, list) {
|
||||
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);
|
||||
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);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue