summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/intel
diff options
context:
space:
mode:
authorMordechay Goodstein <mordechay.goodstein@intel.com>2020-12-10 00:16:05 +0300
committerLuca Coelho <luciano.coelho@intel.com>2020-12-10 01:11:15 +0300
commit2f8cfcc43dae3fbb3cdb7377b06db5d2fef78ed6 (patch)
treeb44d0ad090b09ef384fc0df47b29adcd9fbe0ae0 /drivers/net/wireless/intel
parent3f79e541593fecc2a90687eb7162e15a499caa33 (diff)
downloadlinux-2f8cfcc43dae3fbb3cdb7377b06db5d2fef78ed6.tar.xz
iwlwifi: remove all queue resources before free
Currently calling iwl_txq_dyn_free only deletes the queue memory/DMA but any active timers are not dealt with. Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Link: https://lore.kernel.org/r/iwlwifi.20201209231351.69231238667c.I04c6d012d9244a73261685f8fc797a26e5c961d6@changeid Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/queue/tx.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.c b/drivers/net/wireless/intel/iwlwifi/queue/tx.c
index af0b27a68d84..c107851d345a 100644
--- a/drivers/net/wireless/intel/iwlwifi/queue/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/queue/tx.c
@@ -1311,11 +1311,7 @@ void iwl_txq_dyn_free(struct iwl_trans *trans, int queue)
return;
}
- iwl_txq_gen2_unmap(trans, queue);
-
- iwl_txq_gen2_free_memory(trans, trans->txqs.txq[queue]);
-
- trans->txqs.txq[queue] = NULL;
+ iwl_txq_gen2_free(trans, queue);
IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", queue);
}