summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-28 18:38:53 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-28 18:38:53 -0700
commit384b90abeba71579e0601ff434e3ea40c15057f0 (patch)
tree40ffc4aa392457e27d6ae9304fa4216db2611f05 /net
parent9e8f90dfe58eb19140bc66655170c7aef9eadbf2 (diff)
parent7676e345824f162191b1fe2058ad948a6cf91c20 (diff)
downloadlinux-384b90abeba71579e0601ff434e3ea40c15057f0.tar.gz
linux-384b90abeba71579e0601ff434e3ea40c15057f0.tar.bz2
linux-384b90abeba71579e0601ff434e3ea40c15057f0.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipvs/ip_vs_ctl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index be43fd805bd0..2b771dc708a3 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3771,6 +3771,7 @@ err_sock:
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);