netfilter: conntrack: split resolve_clash function
authorFlorian Westphal <fw@strlen.de>
Mon, 3 Feb 2020 16:37:06 +0000 (17:37 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 11 Feb 2020 10:45:01 +0000 (11:45 +0100)
commitbb89abe52bf426f1f40850c441efc77426cc31e1
treec6a841107076513fec3aed4d84a1fd5c521a6fe8
parentb1b32552c1d81f0cf6a8e79043a2a47e769ff071
netfilter: conntrack: split resolve_clash function

Followup patch will need a helper function with the 'clashing entries
refer to the identical tuple in both directions' resolution logic.

This patch will add another resolve_clash helper where loser_ct must
not be added to the dying list because it will be inserted into the
table.

Therefore this also moves the stat counters and dying-list insertion
of the losing ct.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_core.c