3.0 patches

diff --git a/queue-3.0/enic-bug-fix-fix-hardware-transmit-queue-indexing-in-enic_poll_controller.patch b/queue-3.0/enic-bug-fix-fix-hardware-transmit-queue-indexing-in-enic_poll_controller.patch
new file mode 100644 (file)
index 0000000..3775901
--- /dev/null
+++ b/queue-3.0/enic-bug-fix-fix-hardware-transmit-queue-indexing-in-enic_poll_controller.patch
@@ -0,0 +1,39 @@
+From b880a954b9e2585ce325aedd76e4741880cab180 Mon Sep 17 00:00:00 2001
+From: Vasanthy Kolluri <vkolluri@cisco.com>
+Date: Thu, 9 Jun 2011 10:37:07 +0000
+Subject: enic: Bug Fix: Fix hardware transmit queue indexing in enic_poll_controller
+
+From: Vasanthy Kolluri <vkolluri@cisco.com>
+
+commit b880a954b9e2585ce325aedd76e4741880cab180 upstream.
+
+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>
+Cc: Chun-Yi Lee <jlee@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/enic/enic_main.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/enic/enic_main.c
++++ b/drivers/net/enic/enic_main.c
+@@ -1718,8 +1718,12 @@ static void enic_poll_controller(struct
+                       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);

diff --git a/queue-3.0/series b/queue-3.0/series
index 69adef5907062dab26580d62e3253317978b1a3f..96250b5d6b3fe99b88b40d75227397503c66b55e 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -160,3 +160,4 @@ ext4-ext4_rename-should-dirty-dir_bh-with-the-correct-directory.patch
 ext4-ext4_mkdir-should-dirty-dir_block-with-newly-created-directory-inode.patch
 ext4-call-ext4_handle_dirty_metadata-with-correct-inode-in-ext4_dx_add_entry.patch
 ext4-fix-race-in-xattr-block-allocation-path.patch
+enic-bug-fix-fix-hardware-transmit-queue-indexing-in-enic_poll_controller.patch