| Message ID | 20220919130627.3551233-1-jhs@mojatatu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1d14b30b5a5e52da93467af7c1dca08f124186df |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/1] net: sched: remove unused tcf_result extension | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 19 Sep 2022 13:06:27 +0000 you wrote: > Added by: > commit e5cf1baf92cb ("act_mirred: use TC_ACT_REINSERT when possible") > but no longer useful. > > Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> > --- > include/net/sch_generic.h | 5 ----- > net/sched/act_mirred.c | 3 +-- > 2 files changed, 1 insertion(+), 7 deletions(-) Here is the summary with links: - [net-next,1/1] net: sched: remove unused tcf_result extension https://git.kernel.org/netdev/net-next/c/1d14b30b5a5e You are awesome, thank you!
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);
Added by: commit e5cf1baf92cb ("act_mirred: use TC_ACT_REINSERT when possible") but no longer useful. Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> --- include/net/sch_generic.h | 5 ----- net/sched/act_mirred.c | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-)