Skip to content

Commit 0b4f688

Browse files
committed
Revert "sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb"
This reverts commit 90fabae. Patch was applied hastily, revert and let the v2 be reviewed. Fixes: 90fabae ("sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb") Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Jakub Kicinski <[email protected]>
1 parent a3daac6 commit 0b4f688

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

net/sched/sch_cake.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
17131713
}
17141714
idx--;
17151715
flow = &b->flows[idx];
1716-
ret = NET_XMIT_SUCCESS;
17171716

17181717
/* ensure shaper state isn't stale */
17191718
if (!b->tin_backlog) {
@@ -1772,7 +1771,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
17721771

17731772
qdisc_tree_reduce_backlog(sch, 1-numsegs, len-slen);
17741773
consume_skb(skb);
1775-
ret |= __NET_XMIT_STOLEN;
17761774
} else {
17771775
/* not splitting */
17781776
cobalt_set_enqueue_time(skb, now);
@@ -1906,7 +1904,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
19061904
}
19071905
b->drop_overlimit += dropped;
19081906
}
1909-
return ret;
1907+
return NET_XMIT_SUCCESS;
19101908
}
19111909

19121910
static struct sk_buff *cake_dequeue_one(struct Qdisc *sch)

0 commit comments

Comments
 (0)