diff options
| author | Florian Westphal <fw@strlen.de> | 2022-01-07 05:03:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-08 14:23:53 +0200 |
| commit | 72dd9e61fa319bc44020c2d365275fc8f6799bff (patch) | |
| tree | 385c229ba86dbdb22189268b1d3d29a3da6efdff /net/sched | |
| parent | 6b663fa23c7ec51489fc43cfd3ce395c46a4e976 (diff) | |
| download | linux-stable-72dd9e61fa319bc44020c2d365275fc8f6799bff.tar.gz linux-stable-72dd9e61fa319bc44020c2d365275fc8f6799bff.tar.bz2 linux-stable-72dd9e61fa319bc44020c2d365275fc8f6799bff.zip | |
net: prefer nf_ct_put instead of nf_conntrack_put
[ Upstream commit 408bdcfce8dfd6902f75fbcd3b99d8b24b506597 ]
Its the same as nf_conntrack_put(), but without the
need for an indirect call. The downside is a module dependency on
nf_conntrack, but all of these already depend on conntrack anyway.
Cc: Paul Blakey <paulb@mellanox.com>
Cc: dev@openvswitch.org
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_ct.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index 4ffea1290ce1..240b3c5d2eb1 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -592,7 +592,7 @@ static bool tcf_ct_skb_nfct_cached(struct net *net, struct sk_buff *skb, if (nf_ct_is_confirmed(ct)) nf_ct_kill(ct); - nf_conntrack_put(&ct->ct_general); + nf_ct_put(ct); nf_ct_set(skb, NULL, IP_CT_UNTRACKED); return false; @@ -757,7 +757,7 @@ static void tcf_ct_params_free(struct rcu_head *head) tcf_ct_flow_table_put(params); if (params->tmpl) - nf_conntrack_put(¶ms->tmpl->ct_general); + nf_ct_put(params->tmpl); kfree(params); } @@ -967,7 +967,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, tc_skb_cb(skb)->post_ct = false; ct = nf_ct_get(skb, &ctinfo); if (ct) { - nf_conntrack_put(&ct->ct_general); + nf_ct_put(ct); nf_ct_set(skb, NULL, IP_CT_UNTRACKED); } |