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

Commit 2e5d04da authored by Daniel Halperin's avatar Daniel Halperin Committed by John W. Linville
Browse files

iwlwifi: disambiguate invalid DMA index warnings 



The exact same error message is used in three different functions in
iwlagn. Add the function name to the error string to disambiguate where
the error is coming from.

Signed-off-by: default avatarDaniel Halperin <dhalperi@cs.washington.edu>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3d82b156

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

+3 −3
Original line number Diff line number Diff line
@@ -408,9 +408,9 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv, 
	unsigned long flags;



	if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {

		IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "

			  "is out of range [0-%d] %d %d\n", txq_id,

			  index, txq->q.n_bd, txq->q.write_ptr,

		IWL_ERR(priv, "%s: Read index for DMA queue txq_id (%d) "

			  "index %d is out of range [0-%d] %d %d\n", __func__,

			  txq_id, index, txq->q.n_bd, txq->q.write_ptr,

			  txq->q.read_ptr);

		return;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -1236,9 +1236,9 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) 
	struct ieee80211_hdr *hdr;



	if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {

		IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "

			  "is out of range [0-%d] %d %d.\n", txq_id,

			  index, q->n_bd, q->write_ptr, q->read_ptr);

		IWL_ERR(priv, "%s: Read index for DMA queue txq id (%d), "

			  "index %d is out of range [0-%d] %d %d.\n", __func__,

			  txq_id, index, q->n_bd, q->write_ptr, q->read_ptr);

		return 0;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -753,9 +753,9 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id, int idx) 
	int nfreed = 0;



	if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 0)) {

		IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "

			  "is out of range [0-%d] %d %d.\n", txq_id,

			  idx, q->n_bd, q->write_ptr, q->read_ptr);

		IWL_ERR(priv, "%s: Read index for DMA queue txq id (%d), "

			  "index %d is out of range [0-%d] %d %d.\n", __func__,

			  txq_id, idx, q->n_bd, q->write_ptr, q->read_ptr);

		return;

	}