ARM: IXP4xx Ethernet NAPI fix

This patch removes some weirdness from IXP4xx Ethernet driver.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index c617b64..9b777d9 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);