diff options
| author | Ayaz Abdulla <aabdulla@nvidia.com> | 2007-03-23 05:49:37 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-28 02:18:51 -0400 |
| commit | fcc5f2665c81e087fb95143325ed769a41128d50 (patch) | |
| tree | 993cfed7cf697546667152ec6db08c0f5e92e217 /drivers | |
| parent | b3b1514c90ab534ec6c9e4452953069f85aacf4d (diff) | |
| download | blackbird-op-linux-fcc5f2665c81e087fb95143325ed769a41128d50.tar.gz blackbird-op-linux-fcc5f2665c81e087fb95143325ed769a41128d50.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/forcedeth.c | 5 |
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) 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 |
