From: Vlad Buslov <vladbu@nvidia.com>
Date: Wed, 7 Apr 2021 15:36:02 +0000 (+0300)
Subject: Revert "net: sched: bump refcount for new action in ACT replace mode"
X-Git-Tag: v5.11.14~1
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=dfbf7440e38c39592fcf5e2147a6685abe4e38cb;p=wrapfs-3.2.y.git

Revert "net: sched: bump refcount for new action in ACT replace mode"

commit 4ba86128ba077fbb7d86516ae24ed642e6c3adef upstream.

This reverts commit 6855e8213e06efcaf7c02a15e12b1ae64b9a7149.

Following commit in series fixes the issue without introducing regression
in error rollback of tcf_action_destroy().

Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 2ba46893884f..f6d5755d669e 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -1049,9 +1049,6 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
 	if (!name)
 		a->hw_stats = hw_stats;
 
-	if (!bind && ovr && err == ACT_P_CREATED)
-		refcount_set(&a->tcfa_refcnt, 2);
-
 	return a;
 
 err_out: