[kernel] r11834 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm series
Martin Michlmayr
tbm at alioth.debian.org
Mon Jul 14 09:10:37 UTC 2008
Author: tbm
Date: Mon Jul 14 09:10:34 2008
New Revision: 11834
Log:
add a fix that didn't make it
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx_napi_fix.patch
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx_napi_fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx_napi_fix.patch Mon Jul 14 09:10:34 2008
@@ -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 at 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 at vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Mon Jul 14 09:10:34 2008
@@ -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
More information about the Kernel-svn-changes
mailing list