Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5996fdc authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Greg Kroah-Hartman
Browse files

Revert "sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb" 

[ Upstream commit 0b4f688d53fdc2a731b9d9cdf0c96255bc024ea6 ]

This reverts commit 90fabae8a2c225c4e4936723c38857887edde5cc.

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

Fixes: 90fabae8a2c2 ("sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb")
Link: https://lore.kernel.org/all/87wnao2ha3.fsf@toke.dk/


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 12f99f07

net/sched/sch_cake.c

+1 −3
Original line number Diff line number Diff line
@@ -1666,7 +1666,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) {
@@ -1727,7 +1726,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);
@@ -1851,7 +1849,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)