From: Mordechay Goodstein Date: Wed, 9 Dec 2020 21:16:05 +0000 (+0200) Subject: iwlwifi: remove all queue resources before free X-Git-Tag: accepted/tizen/unified/20230118.172025~8321^2~32^2~13^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f8cfcc43dae3fbb3cdb7377b06db5d2fef78ed6;p=platform%2Fkernel%2Flinux-rpi.git 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 Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20201209231351.69231238667c.I04c6d012d9244a73261685f8fc797a26e5c961d6@changeid Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/queue/tx.c b/drivers/net/wireless/intel/iwlwifi/queue/tx.c index af0b27a..c107851 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); }