* [PATCH 7/12] eexpress: fix !SMP unused-var warning
[not found] <tueoct232007613pm.likjasfdlkjdas987@havoc.gtf.org>
@ 2007-10-23 22:36 ` Jeff Garzik
2007-10-23 22:36 ` [PATCH 8/12] ni5010: kill unused variable Jeff Garzik
2007-10-23 22:36 ` [PATCH 11/12] NET: fix subqueue bugs Jeff Garzik
2 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2007-10-23 22:36 UTC (permalink / raw)
To: LKML; +Cc: akpm, netdev
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 9c85e50..70509ed 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -651,9 +651,9 @@ static void eexp_timeout(struct net_device *dev)
*/
static int eexp_xmit(struct sk_buff *buf, struct net_device *dev)
{
- struct net_local *lp = netdev_priv(dev);
short length = buf->len;
#ifdef CONFIG_SMP
+ struct net_local *lp = netdev_priv(dev);
unsigned long flags;
#endif
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 8/12] ni5010: kill unused variable
[not found] <tueoct232007613pm.likjasfdlkjdas987@havoc.gtf.org>
2007-10-23 22:36 ` [PATCH 7/12] eexpress: fix !SMP unused-var warning Jeff Garzik
@ 2007-10-23 22:36 ` Jeff Garzik
2007-10-23 22:36 ` [PATCH 11/12] NET: fix subqueue bugs Jeff Garzik
2 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2007-10-23 22:36 UTC (permalink / raw)
To: LKML; +Cc: akpm, netdev
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 14a768f..a20005c 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -518,7 +518,6 @@ static void dump_packet(void *buf, int len)
/* We have a good packet, get it out of the buffer. */
static void ni5010_rx(struct net_device *dev)
{
- struct ni5010_local *lp = netdev_priv(dev);
int ioaddr = dev->base_addr;
unsigned char rcv_stat;
struct sk_buff *skb;
@@ -577,7 +576,6 @@ static void ni5010_rx(struct net_device *dev)
PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n",
dev->name, i_pkt_size));
-
}
static int process_xmt_interrupt(struct net_device *dev)
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 11/12] NET: fix subqueue bugs
[not found] <tueoct232007613pm.likjasfdlkjdas987@havoc.gtf.org>
2007-10-23 22:36 ` [PATCH 7/12] eexpress: fix !SMP unused-var warning Jeff Garzik
2007-10-23 22:36 ` [PATCH 8/12] ni5010: kill unused variable Jeff Garzik
@ 2007-10-23 22:36 ` Jeff Garzik
2007-10-23 22:38 ` David Miller
2 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2007-10-23 22:36 UTC (permalink / raw)
To: LKML, davem; +Cc: akpm, netdev
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 <jgarzik@redhat.com>
---
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);
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 11/12] NET: fix subqueue bugs
2007-10-23 22:36 ` [PATCH 11/12] NET: fix subqueue bugs Jeff Garzik
@ 2007-10-23 22:38 ` David Miller
2007-10-23 22:40 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2007-10-23 22:38 UTC (permalink / raw)
To: jeff; +Cc: linux-kernel, akpm, netdev
From: Jeff Garzik <jeff@garzik.org>
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 <jgarzik@redhat.com>
I have another copy of this from Pavel earlier in my inbox
and I promise I will integrate his patch today :-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 11/12] NET: fix subqueue bugs
2007-10-23 22:38 ` David Miller
@ 2007-10-23 22:40 ` Jeff Garzik
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2007-10-23 22:40 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, akpm, netdev
David Miller wrote:
> From: Jeff Garzik <jeff@garzik.org>
> 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 <jgarzik@redhat.com>
>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread