diff options
author | Yinghai Lu <yinghai@kernel.org> | 2009-02-06 04:30:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-06 04:30:36 -0500 |
commit | 0335ef5d59f40931e1b8f0a8be6a09dbc623081b (patch) | |
tree | 2d22c6f3bacad15a623824da3e3711bef9cb617c /drivers/net/forcedeth.c | |
parent | 79d30a581fc405fc63322622cb1517d95ed8f5ce (diff) |
forcedeth: disable irq at first before schedule rx
Impact: clean up
schedule it later after disable it.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 2d5f7d42e92a..a7c15715cd83 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -3708,13 +3708,13 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data) | |||
3708 | u32 events; | 3708 | u32 events; |
3709 | 3709 | ||
3710 | events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQ_RX_ALL; | 3710 | events = readl(base + NvRegMSIXIrqStatus) & NVREG_IRQ_RX_ALL; |
3711 | writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus); | ||
3712 | 3711 | ||
3713 | if (events) { | 3712 | if (events) { |
3714 | napi_schedule(&np->napi); | ||
3715 | /* disable receive interrupts on the nic */ | 3713 | /* disable receive interrupts on the nic */ |
3716 | writel(NVREG_IRQ_RX_ALL, base + NvRegIrqMask); | 3714 | writel(NVREG_IRQ_RX_ALL, base + NvRegIrqMask); |
3717 | pci_push(base); | 3715 | pci_push(base); |
3716 | writel(NVREG_IRQ_RX_ALL, base + NvRegMSIXIrqStatus); | ||
3717 | napi_schedule(&np->napi); | ||
3718 | } | 3718 | } |
3719 | return IRQ_HANDLED; | 3719 | return IRQ_HANDLED; |
3720 | } | 3720 | } |