The patch titled
arm: IXP4xx Ethernet NAPI fix
has been added to the -mm tree. Its filename is
arm-ixp4xx-ethernet-napi-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: arm: IXP4xx Ethernet NAPI fix
From: Krzysztof Halasa <khc@xxxxxxxxx>
This patch removes some weirdness from IXP4xx Ethernet driver.
Signed-off-by: Krzysztof Halasa <khc@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/arm/ixp4xx_eth.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/net/arm/ixp4xx_eth.c~arm-ixp4xx-ethernet-napi-fix drivers/net/arm/ixp4xx_eth.c
--- a/drivers/net/arm/ixp4xx_eth.c~arm-ixp4xx-ethernet-napi-fix
+++ a/drivers/net/arm/ixp4xx_eth.c
@@ -522,7 +522,6 @@ static int eth_poll(struct napi_struct *
#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 *
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);
_
Patches currently in -mm which might be from khc@xxxxxxxxx are
linux-next.patch
arm-ixp4xx-ethernet-napi-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
