Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32faad90 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: improve the prints in the reclaim path 



Some information was redundation, other was missing.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 56bd90f2

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h

+5 −0
Original line number Diff line number Diff line
@@ -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)

{

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+3 −3
Original line number Diff line number Diff line
@@ -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");