diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 13:20:39 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 13:22:33 +0200 |
| commit | 98ca74f4d5b44e58d926a38ae160f1ff9573687e (patch) | |
| tree | 986868f47c88fe737e58c07db9a4c2ed9180a333 /net/netfilter | |
| parent | 915136065b7ca75af4cae06281e4dc43926edbfe (diff) | |
| parent | 9802d21e7a0b0d2167ef745edc1f4ea7a0fc6ea3 (diff) | |
| download | blackbird-op-linux-98ca74f4d5b44e58d926a38ae160f1ff9573687e.tar.gz blackbird-op-linux-98ca74f4d5b44e58d926a38ae160f1ff9573687e.zip | |
Merge branch 'ipvs'
Simon Horman says:
====================
Fix for panic due use of tot_stats estimator outside of CONFIG_SYSCTL
It has been present since v3.6.39.
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index c42e83d2751c..581a6584ed0c 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3778,6 +3778,7 @@ static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) cancel_delayed_work_sync(&ipvs->defense_work); cancel_work_sync(&ipvs->defense_work.work); unregister_net_sysctl_table(ipvs->sysctl_hdr); + ip_vs_stop_estimator(net, &ipvs->tot_stats); } #else @@ -3840,7 +3841,6 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net) struct netns_ipvs *ipvs = net_ipvs(net); ip_vs_trash_cleanup(net); - ip_vs_stop_estimator(net, &ipvs->tot_stats); ip_vs_control_net_cleanup_sysctl(net); remove_proc_entry("ip_vs_stats_percpu", net->proc_net); remove_proc_entry("ip_vs_stats", net->proc_net); |
