Skip to content

Commit

Permalink
net: sched: remove unused tcf_result extension
Browse files Browse the repository at this point in the history
Added by:
commit e5cf1ba ("act_mirred: use TC_ACT_REINSERT when possible")
but no longer useful.

Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://lore.kernel.org/r/20220919130627.3551233-1-jhs@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jamal Hadi Salim authored and Jakub Kicinski committed Sep 22, 2022
1 parent cdf49ff commit 1d14b30
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
5 changes: 0 additions & 5 deletions include/net/sch_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
};
};

Expand Down
3 changes: 1 addition & 2 deletions net/sched/act_mirred.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 1d14b30

Please sign in to comment.