]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
projects / thirdparty / kernel / stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a7da92c) | patch
netfilter: conntrack: remove two args from resolve_clash
authorFlorian Westphal <fw@strlen.de>
Mon, 3 Feb 2020 16:37:04 +0000 (17:37 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 11 Feb 2020 10:45:01 +0000 (11:45 +0100)
commit3d1e0b406de16508de96f4a07fc3f94cfc678372
tree01e5ac01e0872e8e7e824065ec7d90896f4df290tree | snapshot
parenta7da92c2c8a1faf253a3b3e292fda6910deba540commit | diff
netfilter: conntrack: remove two args from resolve_clash

ctinfo is whats taken from the skb, i.e.
ct = nf_ct_get(skb, &ctinfo).

We do not pass 'ct' and instead re-fetch it from the skb.
Just do the same for both netns and ctinfo.

Also add a comment on what clash resolution is supposed to do.
While at it, one indent level can be removed.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_core.c diff | blob | blame | history
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git