iwlwifi: don't double-activate queue 4

The fourth queue (command queue) is already activated in
the loop above that also maps it to the command FIFO and
therefore doesn't need to be marked as activated again.
Also change the TODO comment to be accurate -- we need
to initialise the _queues_, not FIFOs, and map them to
device FIFOs.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 910217f0ad8aa05159f8b17c02e914f9c7c44b96..6ea5e2dc273ce5502c30995b875d22664c5a20f4 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -661,9 +661,13 @@ int iwl5000_alive_notify(struct iwl_priv *priv)
                iwl_txq_ctx_activate(priv, i);
                iwl5000_tx_queue_set_status(priv, &priv->txq[i], ac, 0);
        }
-       /* TODO - need to initialize those FIFOs inside the loop above,
-        * not only mark them as active */
-       iwl_txq_ctx_activate(priv, 4);
+
+       /*
+        * TODO - need to initialize these queues and map them to FIFOs
+        * in the loop above, not only mark them as active. We do this
+        * because we want the first aggregation queue to be queue #10,
+        * but do not use 8 or 9 otherwise yet.
+        */
        iwl_txq_ctx_activate(priv, 7);
        iwl_txq_ctx_activate(priv, 8);
        iwl_txq_ctx_activate(priv, 9);