aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-11-04 15:14:31 -0500
committerPatrick McHardy <kaber@trash.net>2009-11-04 15:14:31 -0500
commit9481721be10a1bfd1ee9ccf507eecd7f37caa5ec (patch)
tree94f6cf30c770c5f2f98b71578bb50bb07153084a
parentaa3c487f355ff1477b8369d9f0b9860387ae21d4 (diff)
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>
-rw-r--r--net/ipv4/netfilter/ip_queue.c2
-rw-r--r--net/ipv6/netfilter/ip6_queue.c2
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:
622static void __exit ip_queue_fini(void) 622static void __exit ip_queue_fini(void)
623{ 623{
624 nf_unregister_queue_handlers(&nfqh); 624 nf_unregister_queue_handlers(&nfqh);
625 synchronize_net(); 625
626 ipq_flush(NULL, 0); 626 ipq_flush(NULL, 0);
627 627
628#ifdef CONFIG_SYSCTL 628#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:
625static void __exit ip6_queue_fini(void) 625static void __exit ip6_queue_fini(void)
626{ 626{
627 nf_unregister_queue_handlers(&nfqh); 627 nf_unregister_queue_handlers(&nfqh);
628 synchronize_net(); 628
629 ipq_flush(NULL, 0); 629 ipq_flush(NULL, 0);
630 630
631#ifdef CONFIG_SYSCTL 631#ifdef CONFIG_SYSCTL