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>

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 4876e26e054d..3cc58420d445 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,
                                 " swq_id=%#.2x (ac %d/hwq %d)\n",
                                 cnt, q->read_ptr, q->write_ptr,
                                 !!test_bit(cnt, priv->queue_stopped),
-                                txq->swq_id,
-                                txq->swq_id & 0x80 ? txq->swq_id & 3 :
-                                txq->swq_id,
-                                txq->swq_id & 0x80 ? (txq->swq_id >> 2) &
-                                0x1f : txq->swq_id);
+                                txq->swq_id, txq->swq_id & 3,
+                                (txq->swq_id >> 2) & 0x1f);
                 if (cnt >= 4)
                         continue;
                 /* for the ACs, display the stop count too */