diff options
author | Florian Westphal <fw@strlen.de> | 2013-07-29 09:41:55 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-09 06:03:33 -0400 |
commit | c655bc6896b94ee0223393f26155c6daf1e2d148 (patch) | |
tree | 493664303eefd739303a67b891c0f7f89c92eb09 /include | |
parent | 54e35cc52346149a7bce8a2f622e215ed17bb56d (diff) |
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')
-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); | |||
248 | 248 | ||
249 | /* Iterate over all conntracks: if iter returns true, it's deleted. */ | 249 | /* Iterate over all conntracks: if iter returns true, it's deleted. */ |
250 | extern void | 250 | extern void |
251 | nf_ct_iterate_cleanup(struct net *net, int (*iter)(struct nf_conn *i, void *data), void *data); | 251 | nf_ct_iterate_cleanup(struct net *net, |
252 | int (*iter)(struct nf_conn *i, void *data), | ||
253 | void *data, u32 portid, int report); | ||
252 | extern void nf_conntrack_free(struct nf_conn *ct); | 254 | extern void nf_conntrack_free(struct nf_conn *ct); |
253 | extern struct nf_conn * | 255 | extern struct nf_conn * |
254 | nf_conntrack_alloc(struct net *net, u16 zone, | 256 | nf_conntrack_alloc(struct net *net, u16 zone, |