Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6

David S. Miller
2 parents 9e8f90dfe5 7676e34582
Showing 1 changed file Side-by-side Diff
net/netfilter/ipvs/ip_vs_ctl.c
@@ -3771,6 +3771,7 @@
 void ip_vs_control_cleanup(void)
 {
 	EnterFunction(2);
+	unregister_netdevice_notifier(&ip_vs_dst_notifier);
 	ip_vs_genl_unregister();
 	nf_unregister_sockopt(&ip_vs_sockopts);
 	LeaveFunction(2);
...	...	@@ -3771,6 +3771,7 @@
3771	3771	void ip_vs_control_cleanup(void)
3772	3772	{
3773	3773	EnterFunction(2);
	3774	+ unregister_netdevice_notifier(&ip_vs_dst_notifier);
3774	3775	ip_vs_genl_unregister();
3775	3776	nf_unregister_sockopt(&ip_vs_sockopts);
3776	3777	LeaveFunction(2);