[SRU][F:linux-bluefield][PATCH v2 5/5] Revert "UBUNTU: SAUCE: net/sched: Provide act to offload action"

[William Tu]

This reverts commit 73cbac8f27c9a13a417f05733786e5c1f11e5d7c.

BugLink: https://bugs.launchpad.net/bugs/2012571

Signed-off-by: William Tu <witu at nvidia.com>
---
 include/net/flow_offload.h | 1 -
 net/sched/cls_api.c        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index d9e2e5d905ee..e9686f7e5cdf 100644
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -166,7 +166,6 @@ typedef void (*action_destr)(void *priv);
 
 struct flow_action_entry {
 	enum flow_action_id		id;
-	void				*act;
 	action_destr			destructor;
 	void				*destructor_priv;
 	union {
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 384a4d815849..5d933c9e9cc0 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3518,7 +3518,6 @@ int tc_setup_flow_action(struct flow_action *flow_action,
 		struct flow_action_entry *entry;
 
 		entry = &flow_action->entries[j];
-		entry->act = act;
 		spin_lock_bh(&act->tcfa_lock);
 		if (is_tcf_gact_ok(act)) {
 			entry->id = FLOW_ACTION_ACCEPT;
-- 
2.34.1