Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6

1 files changed, 15 insertions, 21 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h
index 92336830415..3f5bedd8875 100644
--- a/drivers/net/wireless/iwlwifi/iwl-helpers.h
+++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h
@@ -95,42 +95,36 @@ static inline int iwl_alloc_fw_desc(struct pci_dev *pci_dev,
  * | | | | | | | |
  * | | | | | | +-+-------- AC queue (0-3)
  * | | | | | |
- * | +-+-+-+-+------------ HW A-MPDU queue
+ * | +-+-+-+-+------------ HW queue ID
  * |
- * +---------------------- indicates agg queue
+ * +---------------------- unused
  */
-static inline u8 iwl_virtual_agg_queue_num(u8 ac, u8 hwq)
+static inline void iwl_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)
 {
         BUG_ON(ac > 3);   /* only have 2 bits */
-        BUG_ON(hwq > 31); /* only have 5 bits */
+        BUG_ON(hwq > 31); /* only use 5 bits */
 
-        return 0x80 | (hwq << 2) | ac;
+        txq->swq_id = (hwq << 2) | ac;
 }
 
-static inline void iwl_wake_queue(struct iwl_priv *priv, u8 queue)
+static inline void iwl_wake_queue(struct iwl_priv *priv,
+                                  struct iwl_tx_queue *txq)
 {
-        u8 ac = queue;
-        u8 hwq = queue;
-
-        if (queue & 0x80) {
-                ac = queue & 3;
-                hwq = (queue >> 2) & 0x1f;
-        }
+        u8 queue = txq->swq_id;
+        u8 ac = queue & 3;
+        u8 hwq = (queue >> 2) & 0x1f;
 
         if (test_and_clear_bit(hwq, priv->queue_stopped))
                 if (atomic_dec_return(&priv->queue_stop_count[ac]) <= 0)
                         ieee80211_wake_queue(priv->hw, ac);
 }
 
-static inline void iwl_stop_queue(struct iwl_priv *priv, u8 queue)
+static inline void iwl_stop_queue(struct iwl_priv *priv,
+                                  struct iwl_tx_queue *txq)
 {
-        u8 ac = queue;
-        u8 hwq = queue;
-
-        if (queue & 0x80) {
-                ac = queue & 3;
-                hwq = (queue >> 2) & 0x1f;
-        }
+        u8 queue = txq->swq_id;
+        u8 ac = queue & 3;
+        u8 hwq = (queue >> 2) & 0x1f;
 
         if (!test_and_set_bit(hwq, priv->queue_stopped))
                 if (atomic_inc_return(&priv->queue_stop_count[ac]) > 0)