diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-04 21:14:31 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-11-04 21:14:31 +0100 |
| commit | 9481721be10a1bfd1ee9ccf507eecd7f37caa5ec (patch) | |
| tree | 94f6cf30c770c5f2f98b71578bb50bb07153084a /net | |
| parent | aa3c487f355ff1477b8369d9f0b9860387ae21d4 (diff) | |
| download | blackbird-op-linux-9481721be10a1bfd1ee9ccf507eecd7f37caa5ec.tar.gz blackbird-op-linux-9481721be10a1bfd1ee9ccf507eecd7f37caa5ec.zip | |
netfilter: remove synchronize_net() calls in ip_queue/ip6_queue
nf_unregister_queue_handlers() already does a synchronize_rcu()
call, we dont need to do it again in callers.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_queue.c | 2 | ||||
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c index c156db215987..9811a456fb5d 100644 --- a/net/ipv4/netfilter/ip_queue.c +++ b/net/ipv4/netfilter/ip_queue.c @@ -622,7 +622,7 @@ cleanup_netlink_notifier: static void __exit ip_queue_fini(void) { nf_unregister_queue_handlers(&nfqh); - synchronize_net(); + ipq_flush(NULL, 0); #ifdef CONFIG_SYSCTL diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 1cf3f0c6a959..a82016fd5d65 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c @@ -625,7 +625,7 @@ cleanup_netlink_notifier: static void __exit ip6_queue_fini(void) { nf_unregister_queue_handlers(&nfqh); - synchronize_net(); + ipq_flush(NULL, 0); #ifdef CONFIG_SYSCTL |
