summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-07-24 14:15:21 +0300
committerJohannes Berg <johannes.berg@intel.com>2013-10-02 11:22:29 +0200
commitf477252051c6cdbd1c8ba299fba8f8b98667ca31 (patch)
tree7828ba37ff6b80eb9c7742a7f2d4efb612cebdb2
parent01ea748cd5bfb88e2d3eaf2ded0f047d37b11484 (diff)
downloadlinux-stable-f477252051c6cdbd1c8ba299fba8f8b98667ca31.tar.gz
linux-stable-f477252051c6cdbd1c8ba299fba8f8b98667ca31.tar.bz2
linux-stable-f477252051c6cdbd1c8ba299fba8f8b98667ca31.zip
iwlwifi: pcie: don't reset the TX queue counter
A few NICs can get into trouble if we reset the TX queue counters in certain very rare situation. To be on the safe side, simply avoid to reset the TX queue counter. This is relevant for non-AMPDU queues only since on AMPDU we have no choice - we must start the TX queue at the right index. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/tx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index f45eb29c2ede..1424335163b9 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1102,6 +1102,8 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
* non-AGG queue.
*/
iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+
+ ssn = trans_pcie->txq[txq_id].q.read_ptr;
}
/* Place first TFD at index corresponding to start sequence number.