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_netlink.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_netlink.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 13918c1fbf66..ab655f660dfa 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -812,9 +812,8 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb, return -ENOENT; } } - if (del_timer(&ct->timeout)) - ct->timeout.function((unsigned long)ct); + nf_ct_kill(ct); nf_ct_put(ct); return 0; |