Re: [PATCH 6.12.y 2/2] net/sched: act_ct: remove 'add_helper' dead code

[Greg KH <greg@kroah.com>]

On Tue, Sep 29, 2026 at 08:30:21PM -0400, Sasha Levin wrote:
> From: Ilya Maximets <i.maximets@ovn.org>
> 
> [ Upstream commit 00df72e39f306e2f7adb68528a5c92109da6a0a9 ]
> 
> This variable can only become 'true' when the connection is not
> confirmed, but it is only checked when it is confirmed.  So, it can be
> treated as being always false and just removed.
> 
> Fixes: a21b06e73191 ("net: sched: add helper support in act_ct")
> Cc: stable@vger.kernel.org
> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
> Reviewed-by: Aaron Conole <aconole@redhat.com>
> Reviewed-by: Xin Long <lucien.xin@gmail.com>
> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
> Link: https://patch.msgid.link/20260921145655.3167436-6-i.maximets@ovn.org
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> [ Retained `p->ct_action & TCA_CT_ACT_NAT` in place of the unavailable `nat` variable. ]
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>  net/sched/act_ct.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
> index 8aed25cad9eef..e1e4f18d3c461 100644
> --- a/net/sched/act_ct.c
> +++ b/net/sched/act_ct.c
> @@ -985,7 +985,6 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
>  	bool cached, commit, clear;
>  	int nh_ofs, err, retval;
>  	struct tcf_ct_params *p;
> -	bool add_helper = false;
>  	bool skb_is_ours = false;
>  	bool skip_add = false;
>  	bool defrag = false;
> @@ -1081,14 +1080,14 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
>  		err = __nf_ct_try_assign_helper(ct, p->tmpl, GFP_ATOMIC);
>  		if (err)
>  			goto drop;
> -		add_helper = true;
> +
>  		if (p->ct_action & TCA_CT_ACT_NAT && !nfct_seqadj(ct)) {
>  			if (!nfct_seqadj_ext_add(ct))
>  				goto drop;
>  		}
>  	}
>  
> -	if (nf_ct_is_confirmed(ct) ? ((!cached && !skip_add) || add_helper) : commit) {
> +	if (nf_ct_is_confirmed(ct) ? (!cached && !skip_add) : commit) {
>  		err = nf_ct_helper(skb, ct, ctinfo, family);
>  		if (err != NF_ACCEPT)
>  			goto nf_error;
> -- 
> 2.53.0
> 
> 

Did not apply :(