From: Jeff Garzik <jeff@garzik.org>
To: Krzysztof Halasa <khc@pm.waw.pl>
Cc: netdev@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>
Subject: Re: [FIX] ARM: IXP4xx Ethernet NAPI fix
Date: Fri, 11 Jul 2008 10:04:13 -0400 [thread overview]
Message-ID: <4877685D.1030503@garzik.org> (raw)
In-Reply-To: <m31w23ia8n.fsf@maximus.localdomain>
Krzysztof Halasa wrote:
> 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 */
applied
next prev parent reply other threads:[~2008-07-11 14:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-09 11:10 [FIX] ARM: IXP4xx Ethernet NAPI fix Krzysztof Halasa
2008-07-11 14:04 ` Jeff Garzik [this message]
2008-07-11 19:18 ` Andrew Morton
2008-07-11 19:41 ` Krzysztof Halasa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4877685D.1030503@garzik.org \
--to=jeff@garzik.org \
--cc=khc@pm.waw.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).