diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-23 23:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-24 00:27:53 -0400 |
commit | 0034622693ad21d6b341a1b51e766f72d1ef512e (patch) | |
tree | be75bb46f9c51a0cf2f6262462710a747b528235 /net | |
parent | 6a5f44d7a048c97b8bae8ce464c97b8fad61ff99 (diff) |
[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:
668f895a85b0c3a62a690425145f13dabebebd7a
[NET]: Hide the queue_mapping field inside netif_subqueue_stopped
commit :(
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/sched/sch_prio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index abd82fc3ec60..de894096e442 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
@@ -136,7 +136,7 @@ prio_dequeue(struct Qdisc* sch) | |||
136 | * pulling an skb. This way we avoid excessive requeues | 136 | * pulling an skb. This way we avoid excessive requeues |
137 | * for slower queues. | 137 | * for slower queues. |
138 | */ | 138 | */ |
139 | if (!netif_subqueue_stopped(sch->dev, (q->mq ? prio : 0))) { | 139 | if (!__netif_subqueue_stopped(sch->dev, (q->mq ? prio : 0))) { |
140 | qdisc = q->queues[prio]; | 140 | qdisc = q->queues[prio]; |
141 | skb = qdisc->dequeue(qdisc); | 141 | skb = qdisc->dequeue(qdisc); |
142 | if (skb) { | 142 | if (skb) { |
@@ -165,7 +165,7 @@ static struct sk_buff *rr_dequeue(struct Qdisc* sch) | |||
165 | * for slower queues. If the queue is stopped, try the | 165 | * for slower queues. If the queue is stopped, try the |
166 | * next queue. | 166 | * next queue. |
167 | */ | 167 | */ |
168 | if (!netif_subqueue_stopped(sch->dev, | 168 | if (!__netif_subqueue_stopped(sch->dev, |
169 | (q->mq ? q->curband : 0))) { | 169 | (q->mq ? q->curband : 0))) { |
170 | qdisc = q->queues[q->curband]; | 170 | qdisc = q->queues[q->curband]; |
171 | skb = qdisc->dequeue(qdisc); | 171 | skb = qdisc->dequeue(qdisc); |