* 2.6.23-rc8-mm2: Fix a compile problem in macb.c
@ 2007-09-28 14:33 Hans-Jürgen Koch
0 siblings, 0 replies; only message in thread
From: Hans-Jürgen Koch @ 2007-09-28 14:33 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: linux-arm-kernel, Andrew Victor
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>
---
Index: linux-2.6.23-rc/drivers/net/macb.c
===================================================================
--- linux-2.6.23-rc.orig/drivers/net/macb.c 2007-09-27 12:55:21.000000000 +0200
+++ linux-2.6.23-rc/drivers/net/macb.c 2007-09-27 13:00:28.000000000 +0200
@@ -492,7 +492,7 @@
}
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 @@
}
work_done = macb_rx(bp, budget);
- if (work_done < orig_budget)
+ if (work_done < budget)
netif_rx_complete(dev, napi);
/*
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-09-28 14:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-09-28 14:33 2.6.23-rc8-mm2: Fix a compile problem in macb.c Hans-Jürgen Koch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®