diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 13:23:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 13:23:12 -0800 |
| commit | 424eff975192553a9ea8bfd51bf65039ffb356ef (patch) | |
| tree | 5fa7b15715b3ce904f7250c50d09bc921d9f28bf /net/ipv6/netfilter/ip6_queue.c | |
| parent | 55dbabee63462a455d8fb57caf08b69db256b012 (diff) | |
| parent | 3666ed1c4837fd6906da0224c5373d7a2186a193 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv6/netfilter/ip6_queue.c')
| -rw-r--r-- | net/ipv6/netfilter/ip6_queue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c index 4c7a18abcaff..db4d5725cce8 100644 --- a/net/ipv6/netfilter/ip6_queue.c +++ b/net/ipv6/netfilter/ip6_queue.c @@ -499,8 +499,7 @@ ipq_rcv_nl_event(struct notifier_block *this, { struct netlink_notify *n = ptr; - if (event == NETLINK_URELEASE && - n->protocol == NETLINK_IP6_FW && n->pid) { + if (event == NETLINK_URELEASE && n->protocol == NETLINK_IP6_FW) { write_lock_bh(&queue_lock); if ((net_eq(n->net, &init_net)) && (n->pid == peer_pid)) __ipq_reset(); @@ -625,7 +624,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 |