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

Commit 00346226 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE 



Fix one more user of netiff_subqueue_stopped. To check for the
queue id one must use the __netiff_subqueue_stoped call.

This run out of my sight when I made the:

668f895a
[NET]: Hide the queue_mapping field inside netif_subqueue_stopped

commit :(

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a5f44d7

net/sched/sch_prio.c

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ prio_dequeue(struct Qdisc* sch) 
		 * pulling an skb.  This way we avoid excessive requeues

		 * for slower queues.

		 */

		if (!netif_subqueue_stopped(sch->dev, (q->mq ? prio : 0))) {

		if (!__netif_subqueue_stopped(sch->dev, (q->mq ? prio : 0))) {

			qdisc = q->queues[prio];

			skb = qdisc->dequeue(qdisc);

			if (skb) {
@@ -165,7 +165,7 @@ static struct sk_buff *rr_dequeue(struct Qdisc* sch) 
		 * for slower queues.  If the queue is stopped, try the

		 * next queue.

		 */

		if (!netif_subqueue_stopped(sch->dev,

		if (!__netif_subqueue_stopped(sch->dev,

					    (q->mq ? q->curband : 0))) {

			qdisc = q->queues[q->curband];

			skb = qdisc->dequeue(qdisc);