leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forcedeth: don't clear nic_poll_irq too early

Browse Source 
Impact: fix bug

for msix, we still need that flag to enable irq respectively

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yinghai Lu 2009-02-06 01:30:01 -08:00 committed by David S. Miller
parent ddb213f076
commit 79d30a581f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/forcedeth.c
View File

@ -4057,8 +4057,6 @@ static void nv_do_nic_poll(unsigned long data)
mask |= NVREG_IRQ_OTHER; mask |= NVREG_IRQ_OTHER;
} }
} }
np->nic_poll_irq = 0;
/* disable_irq() contains synchronize_irq, thus no irq handler can run now */ /* disable_irq() contains synchronize_irq, thus no irq handler can run now */
if (np->recover_error) { if (np->recover_error) {
@ -4096,11 +4094,11 @@ static void nv_do_nic_poll(unsigned long data)
} }
} }
writel(mask, base + NvRegIrqMask); writel(mask, base + NvRegIrqMask);
pci_push(base); pci_push(base);
if (!using_multi_irqs(dev)) { if (!using_multi_irqs(dev)) {
np->nic_poll_irq = 0;
if (nv_optimized(np)) if (nv_optimized(np))
nv_nic_irq_optimized(0, dev); nv_nic_irq_optimized(0, dev);
else else
@ -4111,18 +4109,22 @@ static void nv_do_nic_poll(unsigned long data)
enable_irq_lockdep(np->pci_dev->irq); enable_irq_lockdep(np->pci_dev->irq);
} else { } else {
if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) { if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) {
np->nic_poll_irq &= ~NVREG_IRQ_RX_ALL;
nv_nic_irq_rx(0, dev); nv_nic_irq_rx(0, dev);
enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector); enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
} }
if (np->nic_poll_irq & NVREG_IRQ_TX_ALL) { if (np->nic_poll_irq & NVREG_IRQ_TX_ALL) {
np->nic_poll_irq &= ~NVREG_IRQ_TX_ALL;
nv_nic_irq_tx(0, dev); nv_nic_irq_tx(0, dev);
enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector); enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);
} }
if (np->nic_poll_irq & NVREG_IRQ_OTHER) { if (np->nic_poll_irq & NVREG_IRQ_OTHER) {
np->nic_poll_irq &= ~NVREG_IRQ_OTHER;
nv_nic_irq_other(0, dev); nv_nic_irq_other(0, dev);
enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector); enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);
} }
} }
} }
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER