Thread (31 messages) flat view 31 messages, 7 authors, 1d ago

Re: [PATCH net 5/6] net/sched: act_ct: remove 'add_helper' dead code

From: Xin Long <lucien.xin@gmail.com>
Date: 2026-09-22 20:43:40
Also in: lkml, netfilter-devel, stable

On Mon, Sep 21, 2026 at 10:57 AM Ilya Maximets [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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>
---
 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 e72143d36b119..f62051ec9d57d 100644
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -986,7 +986,6 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
        struct nf_hook_state state;
        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;
@@ -1096,14 +1095,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 (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.55.0
Reviewed-by: Xin Long <lucien.xin@gmail.com>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help