---

yaml --- r: 224374 b: refs/heads/master c: 32aa77a h: refs/heads/master v: v3
git-mirror · Nov 17, 2010 · 4d08edd · 4d08edd
1 parent 689560b
commit 4d08edd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b953799ee29075afd30afe4c0fb65f278b088f69
+refs/heads/master: 32aa77a4fc06bd1116f83c25bf0389a3e9b80533
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -2182,9 +2182,11 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
 		} else if (handler == &ixgbe_msix_clean_tx) {
 			sprintf(adapter->name[vector], "%s-%s-%d",
 				netdev->name, "tx", ti++);
-		} else
+		} else {
 			sprintf(adapter->name[vector], "%s-%s-%d",
-				netdev->name, "TxRx", vector);
+				netdev->name, "TxRx", ri++);
+			ti++;
+		}
 
 		err = request_irq(adapter->msix_entries[vector].vector,
 				  handler, 0, adapter->name[vector],