ipvs: use nf_ct_kill helper

Once timer is removed from nf_conn struct we cannot open-code
the removal sequence anymore.

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
index f04fd8df210b43ae551585316ac865959a0eae1d..fc230d99aa3b0143f198d7a9ec798344886058ad 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_nfct.c
+++ b/net/netfilter/ipvs/ip_vs_nfct.c
@@ -281,13 +281,10 @@ void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp)
        h = nf_conntrack_find_get(cp->ipvs->net, &nf_ct_zone_dflt, &tuple);
        if (h) {
                ct = nf_ct_tuplehash_to_ctrack(h);
-               /* Show what happens instead of calling nf_ct_kill() */
-               if (del_timer(&ct->timeout)) {
-                       IP_VS_DBG(7, "%s: ct=%p, deleted conntrack timer for tuple="
+               if (nf_ct_kill(ct)) {
+                       IP_VS_DBG(7, "%s: ct=%p, deleted conntrack for tuple="
                                FMT_TUPLE "\n",
                                __func__, ct, ARG_TUPLE(&tuple));
-                       if (ct->timeout.function)
-                               ct->timeout.function(ct->timeout.data);
                } else {
                        IP_VS_DBG(7, "%s: ct=%p, no conntrack timer for tuple="
                                FMT_TUPLE "\n",