diff options
| author | Colin Cross <ccross@android.com> | 2011-10-27 15:03:56 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-27 15:03:56 -0700 |
| commit | 60988eca1376ba564e778007cbffabebf05599e1 (patch) | |
| tree | a188cdd22dc3a9d42955679dc01357bcd0d7e264 /net/netfilter | |
| parent | 47d998a7cec61a44b9e0799301039a63fed28280 (diff) | |
| parent | bc2e7067af4c1cd074aaec71c2982e2265f7f169 (diff) | |
| download | kernel_samsung_espresso10-60988eca1376ba564e778007cbffabebf05599e1.zip kernel_samsung_espresso10-60988eca1376ba564e778007cbffabebf05599e1.tar.gz kernel_samsung_espresso10-60988eca1376ba564e778007cbffabebf05599e1.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
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 699c79a..a178cb3 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); |