Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e760f1a authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: don't WARN when a non empty queue is disabled 



This can happen when we shut down suddenly an interface.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 378b8f7f

drivers/net/wireless/iwlwifi/pcie/tx.c

+0 −8
Original line number Diff line number Diff line
@@ -480,11 +480,9 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, 
void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	u16 rd_ptr, wr_ptr;

	u32 stts_addr = trans_pcie->scd_base_addr +

			SCD_TX_STTS_QUEUE_OFFSET(txq_id);

	static const u32 zero_val[4] = {};

	int n_bd = trans_pcie->txq[txq_id].q.n_bd;



	if (!test_and_clear_bit(txq_id, trans_pcie->queue_used)) {

		WARN_ONCE(1, "queue %d not used", txq_id);
@@ -493,12 +491,6 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id) 


	iwl_txq_set_inactive(trans, txq_id);



	rd_ptr = iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq_id)) & (n_bd - 1);

	wr_ptr = iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq_id));



	WARN_ONCE(rd_ptr != wr_ptr, "queue %d isn't empty: [%d,%d]",

		  txq_id, rd_ptr, wr_ptr);



	_iwl_write_targ_mem_dwords(trans, stts_addr,

				   zero_val, ARRAY_SIZE(zero_val));