[<prev] [next>] [day] [month] [year] [list]
Message-ID: <49C00381.8050207@garzik.org>
Date: Tue, 17 Mar 2009 16:09:37 -0400
From: Jeff Garzik <jeff@...zik.org>
To: Karsten Wiese <fzu@...gehoertderstaat.de>
CC: linux-kernel@...r.kernel.org, NetDev <netdev@...r.kernel.org>,
Francois Romieu <romieu@...zoreil.com>
Subject: Re: [PATCH] r8169: Fix irq masking in rtl8169_interrupt()
Karsten Wiese wrote:
> Only adjust the NAPI bits of the interruptmask, if netif_rx_schedule_prep()
> returns true.
> Without this, I see interrupt storms here using 2.6.29-rcx and 2.6.27.19 and
> device needed rmmod r8169 + modprobe r8169 to start working.
>
> Signed-off-by: Karsten Wiese <fzu@...gehoertderstaat.de>
> ---
> drivers/net/r8169.c | 9 ++++-----
> 1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
> index b347340..0c943ba 100644
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@ -3708,12 +3708,11 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
> rtl8169_check_link_status(dev, tp, ioaddr);
>
> if (status & tp->napi_event) {
> - RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
> - tp->intr_mask = ~tp->napi_event;
> -
> - if (likely(netif_rx_schedule_prep(&tp->napi)))
> + if (likely(netif_rx_schedule_prep(&tp->napi))) {
> + RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
> + tp->intr_mask = ~tp->napi_event;
> __netif_rx_schedule(&tp->napi);
> - else if (netif_msg_intr(tp)) {
> + } else if (netif_msg_intr(tp)) {
> printk(KERN_INFO "%s: interrupt %04x in poll\n",
FWIW, you should CC net driver patches to netdev@...r.kernel.org, so
that they get tracked in patchworks and handled by the right people.
Jeff
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists