aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasanthy Kolluri <vkolluri@cisco.com>2011-06-09 06:37:07 -0400
committerDavid S. Miller <davem@davemloft.net>2011-06-09 17:58:09 -0400
commitb880a954b9e2585ce325aedd76e4741880cab180 (patch)
treeaee037ce64fa68d30a7ce414a023e92a5b8ce5d6
parent7d260ec26ee56495bcb32491d44ed4590cc838a0 (diff)
enic: Bug Fix: Fix hardware transmit queue indexing in enic_poll_controller
Signed-off-by: Christian Benvenuti <benve@cisco.com> Signed-off-by: Danny Guo <dannguo@cisco.com> Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com> Signed-off-by: Roopa Prabhu <roprabhu@cisco.com> Signed-off-by: David Wang <dwang2@cisco.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/enic/enic.h2
-rw-r--r--drivers/net/enic/enic_main.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 2dcf310d837c..f747bceb75b1 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
32 32
33#define DRV_NAME "enic" 33#define DRV_NAME "enic"
34#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" 34#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
35#define DRV_VERSION "2.1.1.19" 35#define DRV_VERSION "2.1.1.20"
36#define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" 36#define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc"
37 37
38#define ENIC_BARS_MAX 6 38#define ENIC_BARS_MAX 6
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index e3bffe1aafb7..4b3a93a924e8 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1777,8 +1777,12 @@ static void enic_poll_controller(struct net_device *netdev)
1777 enic_isr_msix_rq(enic->msix_entry[intr].vector, 1777 enic_isr_msix_rq(enic->msix_entry[intr].vector,
1778 &enic->napi[i]); 1778 &enic->napi[i]);
1779 } 1779 }
1780 intr = enic_msix_wq_intr(enic, i); 1780
1781 enic_isr_msix_wq(enic->msix_entry[intr].vector, enic); 1781 for (i = 0; i < enic->wq_count; i++) {
1782 intr = enic_msix_wq_intr(enic, i);
1783 enic_isr_msix_wq(enic->msix_entry[intr].vector, enic);
1784 }
1785
1782 break; 1786 break;
1783 case VNIC_DEV_INTR_MODE_MSI: 1787 case VNIC_DEV_INTR_MODE_MSI:
1784 enic_isr_msi(enic->pdev->irq, enic); 1788 enic_isr_msi(enic->pdev->irq, enic);