Skip to contentSkip to conversation

netfilter: remove synchronize_net() calls in ip_queue/ip6_queue

PATCH Applied Eric Dumazet 2 participants 2 messages Nov 4, 2009

Subsystems (3)
Networking Network drivers netfilter
lore
Share & tools
lore

Eric Dumazet

author
#0 lore raw

PATCH 1/1 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 protected]>
---
 net/ipv4/netfilter/ip_queue.c  |    2 +-
 net/ipv6/netfilter/ip6_queue.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/netfilter/ip_queue.c +1 -1
index c156db2..9811a45 100644
@@ -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
net/ipv6/netfilter/ip6_queue.c +1 -1
index 1cf3f0c..a82016f 100644
@@ -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
Applied
#1 lore raw
Quoted 2 lines · Eric Dumazet

nf_unregister_queue_handlers() already does a synchronize_rcu() call, we dont need to do it again in callers.

Applied, thanks Eric.