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

Commit bc2529c3 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: s/iwlagn_txq_free_tfd/iwl_txq_free_tfd 



Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: default avatarWey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 142fb5b7

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

+2 −2
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ void iwl_trans_tx_queue_set_status(struct iwl_trans *trans, 
				   int tx_fifo_id, bool active);

void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int queue, int fifo,

				 int sta_id, int tid, int frame_limit, u16 ssn);

void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,

void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,

		      enum dma_data_direction dma_dir);

int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,

			 struct sk_buff_head *skbs);

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

+4 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta, 
}



/**

 * iwlagn_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]

 * iwl_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]

 * @trans - transport private data

 * @txq - tx queue

 * @dma_dir - the direction of the DMA mapping
@@ -217,7 +217,7 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta, 
 * Does NOT advance any TFD circular buffer read/write indexes

 * Does NOT free the TFD itself (which is within circular buffer)

 */

void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,

void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,

		      enum dma_data_direction dma_dir)

{

	struct iwl_tfd *tfd_tmp = txq->tfds;
@@ -979,7 +979,7 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index, 


		iwlagn_txq_inval_byte_cnt_tbl(trans, txq);



		iwlagn_txq_free_tfd(trans, txq, DMA_TO_DEVICE);

		iwl_txq_free_tfd(trans, txq, DMA_TO_DEVICE);

		freed++;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id) 


	spin_lock_bh(&txq->lock);

	while (q->write_ptr != q->read_ptr) {

		iwlagn_txq_free_tfd(trans, txq, dma_dir);

		iwl_txq_free_tfd(trans, txq, dma_dir);

		q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd);

	}

	spin_unlock_bh(&txq->lock);