Subject: netfilter 02/08: remove synchronize_net() calls in ip_queue/ip6_queue

From: Patrick McHardy <[email-masked]>
Date: Thu, 3 Dec 2009 21:19:34 +0100 (MET)

commit 9481721be10a1bfd1ee9ccf507eecd7f37caa5ec
Author: Eric Dumazet <[email-masked]>
Date:   Wed Nov 4 21:14:31 2009 +0100

    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 <[email-masked]>
    Signed-off-by: Patrick McHardy <[email-masked]>

diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index c156db2..9811a45 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 1cf3f0c..a82016f 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