add a fix that didn't make it
svn path=/dists/trunk/linux-2.6/; revision=11834
This commit is contained in:
parent
aa84751e04
commit
90d6eaad0a
|
@ -0,0 +1,30 @@
|
|||
This patch removes some weirdness from IXP4xx Ethernet driver.
|
||||
Ideally it should go in 2.6.26 though it's not that critical. Thanks.
|
||||
|
||||
Signed-off-by: Krzysztof Ha³asa <khc@pm.waw.pl>
|
||||
|
||||
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);
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe netdev" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
|
@ -32,6 +32,7 @@
|
|||
+ bugfix/arm/disable-scsi_acard.patch
|
||||
+ bugfix/arm/disable-ath5k.patch
|
||||
+ bugfix/arm/disable-r6040.patch
|
||||
+ bugfix/arm/ixp4xx_napi_fix.patch
|
||||
+ features/arm/speed_flush_cache.patch
|
||||
+ features/arm/5281d0.patch
|
||||
+ features/arm/fix_cache_alignment.patch
|
||||
|
|
Loading…
Reference in New Issue