Merge tag 'wireless-drivers-next-for-davem-2016-09-15' of git://git.kernel.org/pub...

[cascardo/linux.git] / net / netfilter / ipvs / ip_vs_nfct.c

diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
index f04fd8d..fc230d9 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",