[ 06/54] iwlwifi: dont WARN when a non empty queue is disabled
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2012-11-30 19:12:14
Also in:
lkml
3.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Emmanuel Grumbach <redacted> commit e1b69fdf33f63cfa600b992172d7376f9d9ef2e9 upstream. This can happen when we shut down suddenly an interface. Signed-off-by: Emmanuel Grumbach <redacted> Signed-off-by: Johannes Berg <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/net/wireless/iwlwifi/pcie/tx.c | 8 -------- 1 file changed, 8 deletions(-)
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c@@ -480,20 +480,12 @@ void iwl_trans_pcie_txq_enable(struct iw 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; - 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); return; } - 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_txq_set_inactive(trans, txq_id); IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id); }