Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6-omap-h63xx.git] / drivers / net / arm / ixp4xx_eth.c

diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index c617b64c288e4d1a883a2e845610f64418c057aa..9b777d9433cd8b87b7c8479ef52c0d893f1ee117 100644 (file)
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -522,7 +522,6 @@ static int eth_poll(struct napi_struct *napi, int budget)
 #endif
 
                if ((n = queue_get_desc(rxq, port, 0)) < 0) {
-                       received = 0; /* No packet received */
 #if DEBUG_RX
                        printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n",
                               dev->name);
@@ -543,7 +542,7 @@ static int eth_poll(struct napi_struct *napi, int budget)
                        printk(KERN_DEBUG "%s: eth_poll all done\n",
                               dev->name);
 #endif
-                       return 0; /* all work done */
+                       return received; /* all work done */
                }
 
                desc = rx_desc_ptr(port, n);