aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAyaz Abdulla <aabdulla@nvidia.com>2007-03-23 06:49:37 -0400
committerJeff Garzik <jeff@garzik.org>2007-03-28 02:18:51 -0400
commitfcc5f2665c81e087fb95143325ed769a41128d50 (patch)
tree993cfed7cf697546667152ec6db08c0f5e92e217
parentb3b1514c90ab534ec6c9e4452953069f85aacf4d (diff)
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>
-rw-r--r--drivers/net/forcedeth.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 46e1697d9cfd..ae4e6f9375c8 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3536,7 +3536,10 @@ static void nv_do_nic_poll(unsigned long data)
3536 pci_push(base); 3536 pci_push(base);
3537 3537
3538 if (!using_multi_irqs(dev)) { 3538 if (!using_multi_irqs(dev)) {
3539 nv_nic_irq(0, dev); 3539 if (np->desc_ver == DESC_VER_3)
3540 nv_nic_irq_optimized(0, dev);
3541 else
3542 nv_nic_irq(0, dev);
3540 if (np->msi_flags & NV_MSI_X_ENABLED) 3543 if (np->msi_flags & NV_MSI_X_ENABLED)
3541 enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector); 3544 enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
3542 else 3545 else