]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
forcedeth: fix nic poll
authorAyaz Abdulla <aabdulla@nvidia.com>
Fri, 23 Mar 2007 10:49:37 +0000 (05:49 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 28 Mar 2007 06:18:51 +0000 (02:18 -0400)
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>
drivers/net/forcedeth.c

index 46e1697d9cfd01638d9e5616027641a0ed639656..ae4e6f9375c81615722f4f1b37ea858406614e34 100644 (file)
@@ -3536,7 +3536,10 @@ static void nv_do_nic_poll(unsigned long data)
        pci_push(base);
 
        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)
                        enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
                else