* [PATCH 2.6.23-rc8-mm2] Fix a compile problem in macb.c
@ 2007-10-02 15:23 Haavard Skinnemoen
2007-10-02 17:31 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Haavard Skinnemoen @ 2007-10-02 15:23 UTC (permalink / raw)
To: David Miller
Cc: Jeff Garzik, netdev, Andrew Morton, Hans-Jürgen Koch,
Haavard Skinnemoen
From: Hans-Jürgen Koch <hjk@linutronix.de>
Compiling macb.c fails because the type of parameter 2 of macb_poll()
was changed from int* to int. Furthermore, a local variable was removed
but was still used inside the function. This patch fixes it.
Signed-off-by: Hans J. Koch <hjk@linutronix.de>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
drivers/net/macb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index c28a0a4..047ea7b 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -492,7 +492,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
}
dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n",
- (unsigned long)status, *budget);
+ (unsigned long)status, budget);
if (!(status & MACB_BIT(REC))) {
dev_warn(&bp->pdev->dev,
@@ -503,7 +503,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
}
work_done = macb_rx(bp, budget);
- if (work_done < orig_budget)
+ if (work_done < budget)
netif_rx_complete(dev, napi);
/*
--
1.5.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.23-rc8-mm2] Fix a compile problem in macb.c
2007-10-02 15:23 [PATCH 2.6.23-rc8-mm2] Fix a compile problem in macb.c Haavard Skinnemoen
@ 2007-10-02 17:31 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-10-02 17:31 UTC (permalink / raw)
To: Haavard Skinnemoen
Cc: David Miller, netdev, Andrew Morton, Hans-Jürgen Koch
Haavard Skinnemoen wrote:
> From: Hans-Jürgen Koch <hjk@linutronix.de>
>
> Compiling macb.c fails because the type of parameter 2 of macb_poll()
> was changed from int* to int. Furthermore, a local variable was removed
> but was still used inside the function. This patch fixes it.
>
> Signed-off-by: Hans J. Koch <hjk@linutronix.de>
> Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
> ---
> drivers/net/macb.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-02 17:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-02 15:23 [PATCH 2.6.23-rc8-mm2] Fix a compile problem in macb.c Haavard Skinnemoen
2007-10-02 17:31 ` Jeff Garzik
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.