From 4f5fd0afbac1d20384a08ab2733456d647b51a3c Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 6 Feb 2009 01:30:36 -0800 Subject: [PATCH] --- yaml --- r: 134309 b: refs/heads/master c: 0335ef5d59f40931e1b8f0a8be6a09dbc623081b h: refs/heads/master i: 134307: 9acec36727b497bda5bc652a604c485aa3d426dd v: v3 --- [refs] | 2 +- trunk/drivers/net/forcedeth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a2f196d9ed33..d7a94581d17e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79d30a581fc405fc63322622cb1517d95ed8f5ce +refs/heads/master: 0335ef5d59f40931e1b8f0a8be6a09dbc623081b diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 2d5f7d42e92a..a7c15715cd83 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -3708,13 +3708,13 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data) u32 events; events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQ_RX_ALL; - writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus); if (events) { - napi_schedule(&np->napi); /* disable receive interrupts on the nic */ writel(NVREG_IRQ_RX_ALL, base + NvRegIrqMask); pci_push(base); + writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus); + napi_schedule(&np->napi); } return IRQ_HANDLED; }