]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/sched: act_ct: Remove redundant ct get and check
authorRoi Dayan <roid@nvidia.com>
Wed, 28 Apr 2021 06:05:32 +0000 (09:05 +0300)
committerJakub Kicinski <kuba@kernel.org>
Wed, 28 Apr 2021 20:51:18 +0000 (13:51 -0700)
The assignment is not being used and redundant.
The check for null is redundant as nf_conntrack_put() also
checks this.

Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Paul Blakey <paulb@nvidia.com>
Link: https://lore.kernel.org/r/20210428060532.3330974-1-roid@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/sched/act_ct.c

index 48fdf7293deaa102d9c85cb714dfc193fe6ee28c..ec7a1c438df94254943eebf654563161496a1f74 100644 (file)
@@ -991,9 +991,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
 
                /* Associate skb with specified zone. */
                if (tmpl) {
-                       ct = nf_ct_get(skb, &ctinfo);
-                       if (skb_nfct(skb))
-                               nf_conntrack_put(skb_nfct(skb));
+                       nf_conntrack_put(skb_nfct(skb));
                        nf_conntrack_get(&tmpl->ct_general);
                        nf_ct_set(skb, tmpl, IP_CT_NEW);
                }