From: Eric W. Biederman Date: Mon, 21 Sep 2015 18:02:27 +0000 (-0500) Subject: ipvs: Pass ipvs not net to estimation_timer X-Git-Tag: KARO-TX6UL-2015-11-03~90^2~208^2~6^2~34 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=70a131a2c815935ecb3b5fa5cb53e6244823d5ff;p=karo-tx-linux.git ipvs: Pass ipvs not net to estimation_timer Signed-off-by: "Eric W. Biederman" Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c index 638a301f7ee4..c86dc456c8f4 100644 --- a/net/netfilter/ipvs/ip_vs_est.c +++ b/net/netfilter/ipvs/ip_vs_est.c @@ -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; }