diff mbox series

[v2,01/47] iwlwifi: remove all queue resources before free

Message ID iwlwifi.20201209231351.69231238667c.I04c6d012d9244a73261685f8fc797a26e5c961d6@changeid (mailing list archive)
State Accepted
Commit 2f8cfcc43dae3fbb3cdb7377b06db5d2fef78ed6
Delegated to: Luca Coelho
Headers show
Series iwlwifi: final patches for v5.11 2020-12-09 | expand

Commit Message

Luca Coelho Dec. 9, 2020, 9:16 p.m. UTC 
From: Mordechay Goodstein <mordechay.goodstein@intel.com>

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>
---
 drivers/net/wireless/intel/iwlwifi/queue/tx.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Luca Coelho Dec. 9, 2020, 10:11 p.m. UTC | #1 
Luca Coelho <luca@coelho.fi> wrote:

> From: Mordechay Goodstein <mordechay.goodstein@intel.com>
> 
> 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>

10 patches applied to iwlwifi-next.git, thanks.

2f8cfcc43dae iwlwifi: remove all queue resources before free
b34872bc831d iwlwifi: yoyo: add the ability to dump phy periphery
cc598782d7c0 iwlwifi: yoyo: align the write pointer to DWs
846067693fc8 iwlwifi: mvm: fix sar profile printing issue
a44509805895 iwlwifi: move reclaim flows to the queue file
525791354706 iwlwifi: d3: do not send the WOWLAN_CONFIGURATION command for netdetect
486e93ef3e1c iwlwifi: mvm: Init error table memory to zero
3b25f1aff503 iwlwifi: mvm: remove the read_nvm from iwl_run_init_mvm_ucode
4adfaf9b2de3 iwlwifi: pcie: remove obsolete pre-release support code
d43ab298efc6 iwlwifi: copy iwl_he_capa for modifications
diff mbox series

Patch

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);
 }