Skip to contentSkip to conversation

2.6.23-rc8-mm2: Fix a compile problem in macb.c

PATCH Hans-Jürgen Koch 1 participant 1 message Sep 28, 2007 Network drivers

lore
Share & tools
lore
#0 lore raw

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.

---

drivers/net/macb.c +2 -2
Index: linux-2.6.23-rc/drivers/net/macb.c
===================================================================
@@ -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);
 
 	/*