iwlwifi: improve the prints in the reclaim path
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Fri, 18 Nov 2011 00:05:10 +0000 (16:05 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Nov 2011 21:20:47 +0000 (16:20 -0500)
Some information was redundation, other was missing.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

index e6a02e09ee18e1115ef83986e3bfaa998ec6d383..4ce64d7ad3bed3d2011776eb536af31e124d8f22 100644 (file)
@@ -790,6 +790,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
                iwl_rx_reply_tx_agg(priv, tx_resp);
 
        if (tx_resp->frame_count == 1) {
+               IWL_DEBUG_TX_REPLY(priv, "Q %d, ssn %d", txq_id, ssn);
                __skb_queue_head_init(&skbs);
                /*we can free until ssn % q.n_bd not inclusive */
                iwl_trans_reclaim(trans(priv), sta_id, tid, txq_id,
index afaaa2a51b966e0bb93477f03fabfbb5590f0d40..5a384b309b097df902aaf1700f56ebb449fa8d06 100644 (file)
@@ -354,6 +354,11 @@ static inline void iwl_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)
        txq->swq_id = (hwq << 2) | ac;
 }
 
+static inline u8 iwl_get_queue_ac(struct iwl_tx_queue *txq)
+{
+       return txq->swq_id & 0x3;
+}
+
 static inline void iwl_wake_queue(struct iwl_trans *trans,
                                  struct iwl_tx_queue *txq, const char *msg)
 {
index 6dba1515023c89efcc95330da663c34c336ea3fd..b93acce08bd2866c184c5a551cf28045e9695f0e 100644 (file)
@@ -1121,9 +1121,6 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
                return 0;
        }
 
-       IWL_DEBUG_TX_REPLY(trans, "reclaim: [%d, %d, %d]\n", txq_id,
-                          q->read_ptr, index);
-
        if (WARN_ON(!skb_queue_empty(skbs)))
                return 0;
 
index 3f2ceb2033dcc3c8aa216b607d29216a33dcea1f..527e7957c932b780712e1966e170337b4d6c9388 100644 (file)
@@ -1350,9 +1350,9 @@ static void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
        }
 
        if (txq->q.read_ptr != tfd_num) {
-               IWL_DEBUG_TX_REPLY(trans, "Retry scheduler reclaim "
-                               "scd_ssn=%d idx=%d txq=%d swq=%d\n",
-                               ssn , tfd_num, txq_id, txq->swq_id);
+               IWL_DEBUG_TX_REPLY(trans, "[Q %d | AC %d] %d -> %d (%d)\n",
+                               txq_id, iwl_get_queue_ac(txq), txq->q.read_ptr,
+                               tfd_num, ssn);
                freed = iwl_tx_queue_reclaim(trans, txq_id, tfd_num, skbs);
                if (iwl_queue_space(&txq->q) > txq->q.low_mark && cond)
                        iwl_wake_queue(trans, txq, "Packets reclaimed");