hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb" 

This reverts commit 90fabae8a2.

Patch was applied hastily, revert and let the v2 be reviewed.

Fixes: 90fabae8a2 ("sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb")
Link: https://lore.kernel.org/all/87wnao2ha3.fsf@toke.dk/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2022-08-31 20:01:32 -07:00
parent a3daac631e
commit 0b4f688d53
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sched/sch_cake.c
View File

@ -1713,7 +1713,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
} }
idx--; idx--;
flow = &b->flows[idx]; flow = &b->flows[idx];
ret = NET_XMIT_SUCCESS;
/* ensure shaper state isn't stale */ /* ensure shaper state isn't stale */
if (!b->tin_backlog) { if (!b->tin_backlog) {
@ -1772,7 +1771,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
qdisc_tree_reduce_backlog(sch, 1-numsegs, len-slen); qdisc_tree_reduce_backlog(sch, 1-numsegs, len-slen);
consume_skb(skb); consume_skb(skb);
ret |= __NET_XMIT_STOLEN;
} else { } else {
/* not splitting */ /* not splitting */
cobalt_set_enqueue_time(skb, now); cobalt_set_enqueue_time(skb, now);
@ -1906,7 +1904,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
} }
b->drop_overlimit += dropped; b->drop_overlimit += dropped;
} }
return ret; return NET_XMIT_SUCCESS;
} }
static struct sk_buff *cake_dequeue_one(struct Qdisc *sch) static struct sk_buff *cake_dequeue_one(struct Qdisc *sch)