diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-11-10 21:25:45 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-11-16 10:46:00 -0500 |
commit | ea9b307f8e859186a6791e0d508c5993448ac900 (patch) | |
tree | e9d4a87fd4570d8720cba2c6945e2068c6833b77 /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
parent | 549a04e092e5e043df82fd0541f3b67ab488359b (diff) |
iwlwifi: always build swq_id as virtual queue ID
Previously, we used the swq_id's mechanism
to have AC and HW queue different only for
aggregation queues. To be able to fix a bug
with iPAN simply always build the swq_id as
ac | (hwq << 2) and remove the flag bit.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 4876e26e054..3cc58420d44 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -992,11 +992,8 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file, | |||
992 | " swq_id=%#.2x (ac %d/hwq %d)\n", | 992 | " swq_id=%#.2x (ac %d/hwq %d)\n", |
993 | cnt, q->read_ptr, q->write_ptr, | 993 | cnt, q->read_ptr, q->write_ptr, |
994 | !!test_bit(cnt, priv->queue_stopped), | 994 | !!test_bit(cnt, priv->queue_stopped), |
995 | txq->swq_id, | 995 | txq->swq_id, txq->swq_id & 3, |
996 | txq->swq_id & 0x80 ? txq->swq_id & 3 : | 996 | (txq->swq_id >> 2) & 0x1f); |
997 | txq->swq_id, | ||
998 | txq->swq_id & 0x80 ? (txq->swq_id >> 2) & | ||
999 | 0x1f : txq->swq_id); | ||
1000 | if (cnt >= 4) | 997 | if (cnt >= 4) |
1001 | continue; | 998 | continue; |
1002 | /* for the ACs, display the stop count too */ | 999 | /* for the ACs, display the stop count too */ |