---

yaml --- r: 237557 b: refs/heads/master c: 894ff7c h: refs/heads/master i: 237555: 7307ae0 v: v3
git-mirror · Mar 3, 2011 · 55e174a · 55e174a
1 parent 711047f
commit 55e174a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf893ee85369debaa05b3c222a40c8ac5273a06
+refs/heads/master: 894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -2597,6 +2597,11 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
 
 		i--;
 		for (; i >= 0; i--) {
+			/* free only the irqs that were actually requested */
+			if (!adapter->q_vector[i]->rxr_count &&
+			    !adapter->q_vector[i]->txr_count)
+				continue;
+
 			free_irq(adapter->msix_entries[i].vector,
 				 adapter->q_vector[i]);
 		}