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>

diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.c b/drivers/net/wireless/intel/iwlwifi/queue/tx.c
index af0b27a68d84dbf53bf6ae65d1b3c23fd36370fe..c107851d345ab9f620c6785ac0fef5cfccc7b166 100644 (file)
--- 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);
 }