[PATCH 11/12] NET: fix subqueue bugs

2007-10-23 Thread Jeff Garzik
net/sched/sch_prio.c: In function ‘prio_dequeue’:
net/sched/sch_prio.c:139: warning: passing argument 2 of 
‘netif_subqueue_stopped’ makes pointer from integer without a cast
net/sched/sch_prio.c: In function ‘rr_dequeue’:
net/sched/sch_prio.c:169: warning: passing argument 2 of 
‘netif_subqueue_stopped’ makes pointer from integer without a cast

Signed-off-by: Jeff Garzik [EMAIL PROTECTED]
---

diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index abd82fc..de89409 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -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);
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 11/12] NET: fix subqueue bugs

2007-10-23 Thread David Miller
From: Jeff Garzik [EMAIL PROTECTED]
Date: Tue, 23 Oct 2007 18:36:46 -0400 (EDT)

 net/sched/sch_prio.c: In function $,1rx(Bprio_dequeue$,1ry(B:
 net/sched/sch_prio.c:139: warning: passing argument 2 of 
 $,1rx(Bnetif_subqueue_stopped$,1ry(B makes pointer from integer without a 
 cast
 net/sched/sch_prio.c: In function $,1rx(Brr_dequeue$,1ry(B:
 net/sched/sch_prio.c:169: warning: passing argument 2 of 
 $,1rx(Bnetif_subqueue_stopped$,1ry(B makes pointer from integer without a 
 cast
 
 Signed-off-by: Jeff Garzik [EMAIL PROTECTED]

I have another copy of this from Pavel earlier in my inbox
and I promise I will integrate his patch today :-)
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 11/12] NET: fix subqueue bugs

2007-10-23 Thread Jeff Garzik

David Miller wrote:

From: Jeff Garzik [EMAIL PROTECTED]
Date: Tue, 23 Oct 2007 18:36:46 -0400 (EDT)


net/sched/sch_prio.c: In function $,1rxprio_dequeue$,1ry:
net/sched/sch_prio.c:139: warning: passing argument 2 of 
$,1rxnetif_subqueue_stopped$,1ry makes pointer from integer without a cast
net/sched/sch_prio.c: In function $,1rxrr_dequeue$,1ry:
net/sched/sch_prio.c:169: warning: passing argument 2 of 
$,1rxnetif_subqueue_stopped$,1ry makes pointer from integer without a cast

Signed-off-by: Jeff Garzik [EMAIL PROTECTED]


I have another copy of this from Pavel earlier in my inbox
and I promise I will integrate his patch today :-)


Either way, all good :)  Just dumping my fixes from last night.

Jeff


-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html