summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2011-02-15 02:12:05 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-03 02:55:56 -0800
commit894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784 (patch)
treeb8d31b54358537abbe4c1325037969097f9fc74b
parentdbf893ee85369debaa05b3c222a40c8ac5273a06 (diff)
downloadop-kernel-dev-894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784.zip
op-kernel-dev-894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784.tar.gz
ixgbe: balance free_irq calls with request_irq calls
We were incorrectly freeing IRQs that we had not requested. This change corrects that by making certain we only free q_vectors that we have requested IRQs for. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Ross Brattain <ross.b.brattain@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f0d0c5a..588661b 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/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]);
}
OpenPOWER on IntegriCloud