summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorKrzysztof Halasa <khc@pm.waw.pl>2008-07-09 13:10:32 +0200
committerJeff Garzik <jgarzik@redhat.com>2008-07-11 10:01:12 -0400
commit9076689ab07974a6f5d230fc241448f7a77e9078 (patch)
treea848b4d74909f14af90b4ee10fb17d1f3bb72af4 /drivers/net
parente35259a95331ae4a9146cc03ab49aad641cab957 (diff)
downloadkernel-crypto-9076689ab07974a6f5d230fc241448f7a77e9078.tar.gz
kernel-crypto-9076689ab07974a6f5d230fc241448f7a77e9078.tar.xz
kernel-crypto-9076689ab07974a6f5d230fc241448f7a77e9078.zip
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/arm/ixp4xx_eth.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
index c617b64c288..9b777d9433c 100644
--- 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);