diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-06-09 15:59:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-09 15:59:06 -0700 |
| commit | 51091764f26ec36c02e35166f083193a30f426fc (patch) | |
| tree | b7103b8d892d4c4b2138437406e2e4be1be13b16 /net/netfilter/nf_conntrack_proto_dccp.c | |
| parent | 31d8519c9cf87e9d8a0cc5b9734fda02af66d7e2 (diff) | |
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_proto_dccp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_dccp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c index afb4a1861d2c..223742f371f9 100644 --- a/net/netfilter/nf_conntrack_proto_dccp.c +++ b/net/netfilter/nf_conntrack_proto_dccp.c @@ -475,8 +475,7 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb, if (type == DCCP_PKT_RESET && !test_bit(IPS_SEEN_REPLY_BIT, &ct->status)) { /* Tear down connection immediately if only reply is a RESET */ - if (del_timer(&ct->timeout)) - ct->timeout.function((unsigned long)ct); + nf_ct_kill(ct); return NF_ACCEPT; } |