diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-28 21:38:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-28 21:38:53 -0400 |
| commit | 384b90abeba71579e0601ff434e3ea40c15057f0 (patch) | |
| tree | 40ffc4aa392457e27d6ae9304fa4216db2611f05 /net/netfilter | |
| parent | 9e8f90dfe58eb19140bc66655170c7aef9eadbf2 (diff) | |
| parent | 7676e345824f162191b1fe2058ad948a6cf91c20 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 1 |
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: | |||
| 3771 | void ip_vs_control_cleanup(void) | 3771 | void ip_vs_control_cleanup(void) |
| 3772 | { | 3772 | { |
| 3773 | EnterFunction(2); | 3773 | EnterFunction(2); |
| 3774 | unregister_netdevice_notifier(&ip_vs_dst_notifier); | ||
| 3774 | ip_vs_genl_unregister(); | 3775 | ip_vs_genl_unregister(); |
| 3775 | nf_unregister_sockopt(&ip_vs_sockopts); | 3776 | nf_unregister_sockopt(&ip_vs_sockopts); |
| 3776 | LeaveFunction(2); | 3777 | LeaveFunction(2); |