From 208e14c3e5e50bebc8173771005125e44db5feef Mon Sep 17 00:00:00 2001
From: Vasanthy Kolluri <vkolluri@cisco.com>
Date: Thu, 9 Jun 2011 10:37:07 +0000
Subject: [PATCH] --- yaml --- r: 255487 b: refs/heads/master c:
 b880a954b9e2585ce325aedd76e4741880cab180 h: refs/heads/master i:   255485:
 8ba586195208a4c46cdc9c8caf281407b2f9e844   255483:
 cc85e03f4586b4d7f9a02873d11aaf6d0aa8d728   255479:
 e618da5f0b4d2a28578aade2f6b44a6d2ce37784   255471:
 e57fd8b972f6576f7c273ccf4a1ed070e5926f92   255455:
 be6182b5d964faa912eedb41d90c131ebda72876   255423:
 34c408d78f02e5735c6d0b15250f8c6adbfcb9bd   255359:
 e537bd510d766bd395ba4379eaf378d925388d02   255231:
 76aa8642412f93091f11f9cda7c46e02afc2b287   254975:
 e591ca225c72c4fef495799d4cf1273c4f784192 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/enic/enic.h      | 2 +-
 trunk/drivers/net/enic/enic_main.c | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e592686ac3e5..ed29d3d83345 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d260ec26ee56495bcb32491d44ed4590cc838a0
+refs/heads/master: b880a954b9e2585ce325aedd76e4741880cab180
diff --git a/trunk/drivers/net/enic/enic.h b/trunk/drivers/net/enic/enic.h
index 2dcf310d837c..f747bceb75b1 100644
--- a/trunk/drivers/net/enic/enic.h
+++ b/trunk/drivers/net/enic/enic.h
@@ -32,7 +32,7 @@
 
 #define DRV_NAME		"enic"
 #define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION		"2.1.1.19"
+#define DRV_VERSION		"2.1.1.20"
 #define DRV_COPYRIGHT		"Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX		6
diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c
index e3bffe1aafb7..4b3a93a924e8 100644
--- a/trunk/drivers/net/enic/enic_main.c
+++ b/trunk/drivers/net/enic/enic_main.c
@@ -1777,8 +1777,12 @@ static void enic_poll_controller(struct net_device *netdev)
 			enic_isr_msix_rq(enic->msix_entry[intr].vector,
 				&enic->napi[i]);
 		}
-		intr = enic_msix_wq_intr(enic, i);
-		enic_isr_msix_wq(enic->msix_entry[intr].vector, enic);
+
+		for (i = 0; i < enic->wq_count; i++) {
+			intr = enic_msix_wq_intr(enic, i);
+			enic_isr_msix_wq(enic->msix_entry[intr].vector, enic);
+		}
+
 		break;
 	case VNIC_DEV_INTR_MODE_MSI:
 		enic_isr_msi(enic->pdev->irq, enic);