Revert "sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb"

[ Upstream commit 13e68caa3b7298372fc14723154215bf72ba6e46 ]

This reverts commit ab1b0cd7b2a8d0ca01e018df7992da63fd1f6745.

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

Fixes: ab1b0cd7b2a8 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 737368c701c53f03d844f412d6ed25b10147f076..0eb4d4a568f77d40e22459325fed5107c99c6d82 100644 (file)
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -1677,7 +1677,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
        }
        idx--;
        flow = &b->flows[idx];
-       ret = NET_XMIT_SUCCESS;
 
        /* ensure shaper state isn't stale */
        if (!b->tin_backlog) {
@@ -1738,7 +1737,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 
                qdisc_tree_reduce_backlog(sch, 1-numsegs, len-slen);
                consume_skb(skb);
-               ret |= __NET_XMIT_STOLEN;
        } else {
                /* not splitting */
                cobalt_set_enqueue_time(skb, now);
@@ -1872,7 +1870,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                }
                b->drop_overlimit += dropped;
        }
-       return ret;
+       return NET_XMIT_SUCCESS;
 }
 
 static struct sk_buff *cake_dequeue_one(struct Qdisc *sch)