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

Commit 61c9eaf9 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller
Browse files

pkt_sched: Fix qdisc len in qdisc_peek_dequeued() 



A packet dequeued and stored as gso_skb in qdisc_peek_dequeued() should
be seen as part of the queue for sch->q.qlen queries until it's really
dequeued with qdisc_dequeue_peeked(), so qlen needs additional updating
in these functions. (Updating qstats.backlog shouldn't matter here.)

Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a36b345

include/net/sch_generic.h

+9 −3
Original line number Diff line number Diff line
@@ -442,8 +442,12 @@ static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch) 
static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch)

{

	/* we can reuse ->gso_skb because peek isn't called for root qdiscs */

	if (!sch->gso_skb)

	if (!sch->gso_skb) {

		sch->gso_skb = sch->dequeue(sch);

		if (sch->gso_skb)

			/* it's still part of the queue */

			sch->q.qlen++;

	}



	return sch->gso_skb;

}
@@ -453,10 +457,12 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch) 
{

	struct sk_buff *skb = sch->gso_skb;



	if (skb)

	if (skb) {

		sch->gso_skb = NULL;

	else

		sch->q.qlen--;

	} else {

		skb = sch->dequeue(sch);

	}



	return skb;

}