From ab05725bfcb36e80ca2ec3238e27b0a546339a68 Mon Sep 17 00:00:00 2001
From: Erik Waling <erik.waling@konftel.com>
Date: Wed, 15 Apr 2009 23:32:11 +0000
Subject: [PATCH] --- yaml --- r: 143868 b: refs/heads/master c:
 f72f550c5885419ee1b32f47213087e6640e766b h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/macb.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 8658415bfc2c..429c01f44b01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee33c58541bae92669fe64a39f695ab533d0de14
+refs/heads/master: f72f550c5885419ee1b32f47213087e6640e766b
diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c
index 9fcc717f4d1a..e82aee41d77e 100644
--- a/trunk/drivers/net/macb.c
+++ b/trunk/drivers/net/macb.c
@@ -521,27 +521,10 @@ static int macb_poll(struct napi_struct *napi, int budget)
 	macb_writel(bp, RSR, status);
 
 	work_done = 0;
-	if (!status) {
-		/*
-		 * This may happen if an interrupt was pending before
-		 * this function was called last time, and no packets
-		 * have been received since.
-		 */
-		napi_complete(napi);
-		goto out;
-	}
 
 	dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n",
 		(unsigned long)status, budget);
 
-	if (!(status & MACB_BIT(REC))) {
-		dev_warn(&bp->pdev->dev,
-			 "No RX buffers complete, status = %02lx\n",
-			 (unsigned long)status);
-		napi_complete(napi);
-		goto out;
-	}
-
 	work_done = macb_rx(bp, budget);
 	if (work_done < budget)
 		napi_complete(napi);
@@ -550,7 +533,6 @@ static int macb_poll(struct napi_struct *napi, int budget)
 	 * We've done what we can to clean the buffers. Make sure we
 	 * get notified when new packets arrive.
 	 */
-out:
 	macb_writel(bp, IER, MACB_RX_INT_FLAGS);
 
 	/* TODO: Handle errors */