diff options
| author | Patrick McHardy | 2008-06-10 00:59:06 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-06-10 00:59:06 +0200 |
| commit | 51091764f26ec36c02e35166f083193a30f426fc (patch) | |
| tree | b7103b8d892d4c4b2138437406e2e4be1be13b16 /net/netfilter/nf_conntrack_core.c | |
| parent | netfilter: nf_conntrack_extend: use krealloc() in nf_conntrack_extend.c V2 (diff) | |
| download | kernel-qcow2-linux-51091764f26ec36c02e35166f083193a30f426fc.tar.gz kernel-qcow2-linux-51091764f26ec36c02e35166f083193a30f426fc.tar.xz kernel-qcow2-linux-51091764f26ec36c02e35166f083193a30f426fc.zip | |
netfilter: nf_conntrack: add nf_ct_kill()
Encapsulate the common
if (del_timer(&ct->timeout))
ct->timeout.function((unsigned long)ct)
sequence in a new function.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index c4b1799da5d7..79b07c35eb87 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -848,6 +848,13 @@ acct: } EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct); +void nf_ct_kill(struct nf_conn *ct) +{ + if (del_timer(&ct->timeout)) + ct->timeout.function((unsigned long)ct); +} +EXPORT_SYMBOL_GPL(nf_ct_kill); + #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) #include <linux/netfilter/nfnetlink.h> |