[git patch] net driver fix for .26

[git patch] net driver fix for .26

[Jeff Garzik]

Please pull from 'davem-fixes' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-fixes

to receive the following updates:

 drivers/net/arm/ixp4xx_eth.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Krzysztof Halasa (1):
      ARM: IXP4xx Ethernet NAPI fix

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

Re: [git patch] net driver fix for .26

[David Miller]

From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 11 Jul 2008 10:09:52 -0400

> 
> Please pull from 'davem-fixes' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-fixes
> 
> to receive the following updates:
> 
>  drivers/net/arm/ixp4xx_eth.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> Krzysztof Halasa (1):
>       ARM: IXP4xx Ethernet NAPI fix

Pulled, thanks Jeff.

This obviously didn't make it into 2.6.26, but if you think
it's relevant let me know and I'll queue it to -stable.