Commit f8b33d8e authored Mar 07, 2016 by Kyeong Yoo Committed by David S. Miller Mar 08, 2016

net_sched: dsmark: use qdisc_dequeue_peeked()



This fix is for dsmark similar to commit 3557619f
("net_sched: prio: use qdisc_dequeue_peeked")
and makes use of qdisc_dequeue_peeked() instead of direct dequeue() call.

First time, wrr peeks dsmark, which will then peek into sfq.
sfq dequeues an skb and it's stored in sch->gso_skb.
Next time, wrr tries to dequeue from dsmark, which will call sfq dequeue
directly. This results skipping the previously peeked skb.

So changed dsmark dequeue to call qdisc_dequeue_peeked() instead to use
peeked skb if exists.

Signed-off-by: Kyeong Yoo <kyeong.yoo@alliedtelesis.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4c38cd61

net/sched/sch_dsmark.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ static struct sk_buff dsmark_dequeue(struct Qdisc sch)

		pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p);

		skb = p->q->ops->dequeue(p->q);
		skb = qdisc_dequeue_peeked(p->q);
		if (skb == NULL)
		return NULL;

Admin message