From 61a7171ee734dc7bba09ecc10fc6d397671fce7e Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 4 Nov 2009 21:14:31 +0100 Subject: [PATCH] --- yaml --- r: 172147 b: refs/heads/master c: 9481721be10a1bfd1ee9ccf507eecd7f37caa5ec h: refs/heads/master i: 172145: 08d61888667f9b2eac2da236f72486e627a61421 172143: b6602fa3cef38f35c8cc4f613a904aed43acc5a6 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_queue.c | 2 +- trunk/net/ipv6/netfilter/ip6_queue.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6dd2ab42316e..211efe786810 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa3c487f355ff1477b8369d9f0b9860387ae21d4 +refs/heads/master: 9481721be10a1bfd1ee9ccf507eecd7f37caa5ec diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c index c156db215987..9811a456fb5d 100644 --- a/trunk/net/ipv4/netfilter/ip_queue.c +++ b/trunk/net/ipv4/netfilter/ip_queue.c @@ -622,7 +622,7 @@ cleanup_ipqnl: __maybe_unused static void __exit ip_queue_fini(void) { nf_unregister_queue_handlers(&nfqh); - synchronize_net(); + ipq_flush(NULL, 0); #ifdef CONFIG_SYSCTL diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c index 1cf3f0c6a959..a82016fd5d65 100644 --- a/trunk/net/ipv6/netfilter/ip6_queue.c +++ b/trunk/net/ipv6/netfilter/ip6_queue.c @@ -625,7 +625,7 @@ cleanup_ipqnl: __maybe_unused static void __exit ip6_queue_fini(void) { nf_unregister_queue_handlers(&nfqh); - synchronize_net(); + ipq_flush(NULL, 0); #ifdef CONFIG_SYSCTL