Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70a131a2 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs not net to estimation_timer 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 3d993766

net/netfilter/ipvs/ip_vs_est.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}