Sfoglia il codice sorgente

forcedeth: fix nic poll

The nic poll routine was missing the call to the optimized irq routine.
This patch adds the missing call for the optimized path.

See http://bugzilla.kernel.org/show_bug.cgi?id=7950 for more information.

Signed-Off-By: Ayaz Abdulla <aabdulla@nvidia.com>

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Ayaz Abdulla 18 anni fa
parent
commit
fcc5f2665c
1 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 4 1
      drivers/net/forcedeth.c

+ 4 - 1
drivers/net/forcedeth.c

@@ -3536,7 +3536,10 @@ static void nv_do_nic_poll(unsigned long data)
 	pci_push(base);
 	pci_push(base);
 
 
 	if (!using_multi_irqs(dev)) {
 	if (!using_multi_irqs(dev)) {
-		nv_nic_irq(0, dev);
+		if (np->desc_ver == DESC_VER_3)
+			nv_nic_irq_optimized(0, dev);
+		else
+			nv_nic_irq(0, dev);
 		if (np->msi_flags & NV_MSI_X_ENABLED)
 		if (np->msi_flags & NV_MSI_X_ENABLED)
 			enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
 			enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
 		else
 		else