diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2011-02-14 21:12:05 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-03-03 05:55:56 -0500 |
commit | 894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784 (patch) | |
tree | b8d31b54358537abbe4c1325037969097f9fc74b /drivers/net/ixgbe | |
parent | dbf893ee85369debaa05b3c222a40c8ac5273a06 (diff) |
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>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index f0d0c5aad2b4..588661ba2b9b 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) | |||
2597 | 2597 | ||
2598 | i--; | 2598 | i--; |
2599 | for (; i >= 0; i--) { | 2599 | for (; i >= 0; i--) { |
2600 | /* free only the irqs that were actually requested */ | ||
2601 | if (!adapter->q_vector[i]->rxr_count && | ||
2602 | !adapter->q_vector[i]->txr_count) | ||
2603 | continue; | ||
2604 | |||
2600 | free_irq(adapter->msix_entries[i].vector, | 2605 | free_irq(adapter->msix_entries[i].vector, |
2601 | adapter->q_vector[i]); | 2606 | adapter->q_vector[i]); |
2602 | } | 2607 | } |