From: Ayaz Abdulla <aabdulla@nvidia.com>
Date: Fri, 23 Mar 2007 10:49:37 +0000 (-0500)
Subject: forcedeth: fix nic poll
X-Git-Tag: v3.12-rc1~30888^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fcc5f2665c81e087fb95143325ed769a41128d50;p=kernel%2Fkernel-generic.git

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>
---

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 46e1697..ae4e6f9 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -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