diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 13:02:28 -0500 |
|---|---|---|
| committer |   Simon Horman <horms@verge.net.au> | 2015-09-24 09:34:39 +0900 |
| commit | a4dd0360c623e5beac011f3674ff7e13b35b5b05 (patch) | |
| tree | 85a63a5e5e24d9bc859854708d2dfce2d7b4fb65 /net/netfilter/ipvs/ip_vs_est.c | |
| parent | ipvs: Pass ipvs not net to estimation_timer (diff) | |
| download | linux-dev-a4dd0360c623e5beac011f3674ff7e13b35b5b05.tar.xz linux-dev-a4dd0360c623e5beac011f3674ff7e13b35b5b05.zip | |
ipvs: Pass ipvs not net to ip_vs_estimator_net_init and ip_vs_estimator_cleanup
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>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_est.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_est.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c index c86dc456c8f4..457c6c193e13 100644 --- a/net/netfilter/ipvs/ip_vs_est.c +++ b/net/netfilter/ipvs/ip_vs_est.c @@ -188,10 +188,8 @@ void ip_vs_read_estimator(struct ip_vs_kstats *dst, struct ip_vs_stats *stats) dst->outbps = (e->outbps + 0xF) >> 5; } -int __net_init ip_vs_estimator_net_init(struct net *net) +int __net_init ip_vs_estimator_net_init(struct netns_ipvs *ipvs) { - struct netns_ipvs *ipvs = net_ipvs(net); - INIT_LIST_HEAD(&ipvs->est_list); spin_lock_init(&ipvs->est_lock); setup_timer(&ipvs->est_timer, estimation_timer, (unsigned long)ipvs); @@ -199,7 +197,7 @@ int __net_init ip_vs_estimator_net_init(struct net *net) return 0; } -void __net_exit ip_vs_estimator_net_cleanup(struct net *net) +void __net_exit ip_vs_estimator_net_cleanup(struct netns_ipvs *ipvs) { - del_timer_sync(&net_ipvs(net)->est_timer); + del_timer_sync(&ipvs->est_timer); } |