diff options
| author |   Florian Westphal <fw@strlen.de> | 2016-08-03 15:21:28 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2016-08-12 00:43:52 +0200 |
| commit | a6c46d9bc9d8ca6e30e681aadd30b73c44434b7d (patch) | |
| tree | 596e4c0bc1304077a8369a08aadccbcad2f4215d | |
| parent | netfilter: use_nf_conn_expires helper in more places (diff) | |
| download | linux-dev-a6c46d9bc9d8ca6e30e681aadd30b73c44434b7d.tar.xz linux-dev-a6c46d9bc9d8ca6e30e681aadd30b73c44434b7d.zip | |
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>
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_nfct.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c index f04fd8df210b..fc230d99aa3b 100644 --- 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", |