Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c46d9b authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent d0b35b93

net/netfilter/ipvs/ip_vs_nfct.c

+2 −5
Original line number Diff line number Diff line
@@ -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",