[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220919130627.3551233-1-jhs@mojatatu.com>
Date: Mon, 19 Sep 2022 13:06:27 +0000
From: Jamal Hadi Salim <jhs@...atatu.com>
To: davem@...emloft.net, kuba@...nel.org, pabeni@...hat.com,
edumazet@...gle.com
Cc: xiyou.wangcong@...il.com, jiri@...nulli.us, netdev@...r.kernel.org,
kernel@...atatu.com, Jamal Hadi Salim <jhs@...atatu.com>
Subject: [PATCH net-next 1/1] net: sched: remove unused tcf_result extension
Added by:
commit e5cf1baf92cb ("act_mirred: use TC_ACT_REINSERT when possible")
but no longer useful.
Signed-off-by: Jamal Hadi Salim <jhs@...atatu.com>
---
include/net/sch_generic.h | 5 -----
net/sched/act_mirred.c | 3 +--
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 7dc83400bde4..32819299937d 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -326,11 +326,6 @@ struct tcf_result {
};
const struct tcf_proto *goto_tp;
- /* used in the skb_tc_reinsert function */
- struct {
- bool ingress;
- struct gnet_stats_queue *qstats;
- };
};
};
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index f9c14d4188d4..b8ad6ae282c0 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -305,8 +305,7 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
/* let's the caller reinsert the packet, if possible */
if (use_reinsert) {
- res->ingress = want_ingress;
- err = tcf_mirred_forward(res->ingress, skb);
+ err = tcf_mirred_forward(want_ingress, skb);
if (err)
tcf_action_inc_overlimit_qstats(&m->common);
__this_cpu_dec(mirred_rec_level);
--
2.25.1
Powered by blists - more mailing lists