diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-10-15 17:57:36 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-18 11:51:09 +0100 |
| commit | e1b69fdf33f63cfa600b992172d7376f9d9ef2e9 (patch) | |
| tree | 8f82226504635e1edf28fda6eda850cb67cd7004 /drivers/net | |
| parent | 04baaa27b43d389879237b32f8bd194a94cf1ca7 (diff) | |
| download | linux-stable-e1b69fdf33f63cfa600b992172d7376f9d9ef2e9.tar.gz linux-stable-e1b69fdf33f63cfa600b992172d7376f9d9ef2e9.tar.bz2 linux-stable-e1b69fdf33f63cfa600b992172d7376f9d9ef2e9.zip | |
iwlwifi: don't WARN when a non empty queue is disabled
This can happen when we shut down suddenly an interface.
Cc: stable@vger.kernel.org
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index 105e3af3c621..79a4ddc002d3 100644 --- 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 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; - 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); } |