diff options
| author |   Florian Westphal <fw@strlen.de> | 2013-07-29 15:41:55 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-09 12:03:33 +0200 |
| commit | c655bc6896b94ee0223393f26155c6daf1e2d148 (patch) | |
| tree | 493664303eefd739303a67b891c0f7f89c92eb09 /include/net | |
| parent | ipvs: ip_vs_sh: ip_vs_sh_get_port: check skb_header_pointer for NULL (diff) | |
| download | linux-dev-c655bc6896b94ee0223393f26155c6daf1e2d148.tar.xz linux-dev-c655bc6896b94ee0223393f26155c6daf1e2d148.zip | |
netfilter: nf_conntrack: don't send destroy events from iterator
Let nf_ct_delete handle delivery of the DESTROY event.
Based on earlier patch from Pablo Neira.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index e5eb8b62538c..0c1288a50e8b 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -248,7 +248,9 @@ extern void nf_ct_untracked_status_or(unsigned long bits); /* Iterate over all conntracks: if iter returns true, it's deleted. */ extern void -nf_ct_iterate_cleanup(struct net *net, int (*iter)(struct nf_conn *i, void *data), void *data); +nf_ct_iterate_cleanup(struct net *net, + int (*iter)(struct nf_conn *i, void *data), + void *data, u32 portid, int report); extern void nf_conntrack_free(struct nf_conn *ct); extern struct nf_conn * nf_conntrack_alloc(struct net *net, u16 zone, |