diff options
| author |   Florian Westphal <fw@strlen.de> | 2013-07-29 15:41:54 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-31 18:51:23 +0200 |
| commit | 02982c27ba1e1bd9f9d4747214e19ca83aa88d0e (patch) | |
| tree | e8936711bc57b91ac2a6cc79dc343af7b6f6aa20 /include/net/netfilter | |
| parent | netfilter: tproxy: remove nf_tproxy_core.h (diff) | |
| download | linux-dev-02982c27ba1e1bd9f9d4747214e19ca83aa88d0e.tar.xz linux-dev-02982c27ba1e1bd9f9d4747214e19ca83aa88d0e.zip | |
netfilter: nf_conntrack: remove duplicate code in ctnetlink
ctnetlink contains copy-paste code from death_by_timeout. In order to
avoid changing both places in upcoming event delivery patch,
export death_by_timeout functionality and use it in the ctnetlink code.
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/netfilter')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 644d9c223d24..939aced35a02 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -181,8 +181,7 @@ __nf_conntrack_find(struct net *net, u16 zone, const struct nf_conntrack_tuple *tuple); extern int nf_conntrack_hash_check_insert(struct nf_conn *ct); -extern void nf_ct_delete_from_lists(struct nf_conn *ct); -extern void nf_ct_dying_timeout(struct nf_conn *ct); +bool nf_ct_delete(struct nf_conn *ct, u32 pid, int report); extern void nf_conntrack_flush_report(struct net *net, u32 portid, int report); |