Home » Mailing list archives » linux-netdev » 2008 » July » 11

[git patch] net driver fix for .26

Previous thread: [PATCH] Fix netfilter xt_time's time_mt()'s use of do_div() by David Howells on Friday, July 11, 2008 - 7:02 am. (4 messages)

Next thread: [PATCH] Fix warnings on calls to P54P_READ() for which the result is discarded by David Howells on Friday, July 11, 2008 - 7:14 am. (2 messages)
[view original message]
From: Jeff Garzik
Subject: [git patch] net driver fix for .26
Date: Friday, July 11, 2008 - 7:09 am

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);
--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [git patch] net driver fix for .26
Date: Monday, July 14, 2008 - 7:36 pm

From: Jeff Garzik <jeff@garzik.org>

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.
--


[ message continues ]
Previous thread: [PATCH] Fix netfilter xt_time's time_mt()'s use of do_div() by David Howells on Friday, July 11, 2008 - 7:02 am. (4 messages)

Next thread: [PATCH] Fix warnings on calls to P54P_READ() for which the result is discarded by David Howells on Friday, July 11, 2008 - 7:14 am. (2 messages)