diff options
| author | Colin Cross <ccross@android.com> | 2011-10-27 15:01:42 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-27 15:01:42 -0700 |
| commit | bc2e7067af4c1cd074aaec71c2982e2265f7f169 (patch) | |
| tree | bc8bcb97155bada3d09c91c6b8aa56ed546471a9 /net/netfilter | |
| parent | 4e9ff24781ab987120e792a667ba45b3d3dd51a0 (diff) | |
| parent | 97596c34030ed28657ccafddb67e17a03890b90a (diff) | |
| download | kernel_samsung_espresso10-bc2e7067af4c1cd074aaec71c2982e2265f7f169.zip kernel_samsung_espresso10-bc2e7067af4c1cd074aaec71c2982e2265f7f169.tar.gz kernel_samsung_espresso10-bc2e7067af4c1cd074aaec71c2982e2265f7f169.tar.bz2 | |
Merge commit 'v3.0.8' into linux-omap-3.0
Conflicts:
drivers/tty/serial/omap-serial.c
drivers/usb/musb/musb_gadget.c
sound/soc/omap/omap-mcbsp.c
Change-Id: Ic31b7266dda3ac8483f737272874ebf4725b5fe3
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); |