|
@@ -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;
|
|
|
}
|