Message ID | 1335186732-16002-3-git-send-email-horms@verge.net.au |
---|---|
State | Accepted |
Headers | show |
On Mon, Apr 23, 2012 at 10:12:12PM +0900, Simon Horman wrote: > From: Julian Anastasov <ja@ssi.bg> > > commit 14e405461e664b777e2a5636e10b2ebf36a686ec (2.6.39) > ("Add __ip_vs_control_{init,cleanup}_sysctl()") > introduced regression due to wrong __net_init for > __ip_vs_control_cleanup_sysctl. This leads to crash when > the ip_vs module is unloaded. > > Fix it by changing __net_init to __net_exit for > the function that is already renamed to ip_vs_control_net_cleanup_sysctl. > > Cc: stable@vger.kernel.org Removed this above. > Signed-off-by: Julian Anastasov <ja@ssi.bg> > Signed-off-by: Hans Schillstrom <hans@schillstrom.com> > Signed-off-by: Simon Horman <horms@verge.net.au> And applied, thanks Simon. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index b3afe18..376d2b1 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3680,7 +3680,7 @@ int __net_init ip_vs_control_net_init_sysctl(struct net *net) return 0; } -void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net) +void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) { struct netns_ipvs *ipvs = net_ipvs(net); @@ -3692,7 +3692,7 @@ void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net) #else int __net_init ip_vs_control_net_init_sysctl(struct net *net) { return 0; } -void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net) { } +void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) { } #endif