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

Commit 3e5d238f authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: use iwl_cmd_queue_free 



iwl_cmd_queue_free needs to be used to free up the cmd_queue,
as TFD slots for cmd_queue and tx_queue are different.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 21c02a1a

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

+5 −6
Original line number Diff line number Diff line
@@ -747,11 +747,6 @@ void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) 
	int i;

	int counter;



	/* classify bd */

	if (txq->q.id == IWL_CMD_QUEUE_NUM)

		/* nothing to cleanup after for host commands */

		return;



	/* sanity check */

	counter = TFD_CTL_COUNT_GET(le32_to_cpu(tfd->control_flags));

	if (counter > NUM_TFD_CHUNKS) {
@@ -1240,7 +1235,11 @@ void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv) 


	/* Tx queues */

	for (txq_id = 0; txq_id <= priv->hw_params.max_txq_num; txq_id++)

		if (txq_id == IWL_CMD_QUEUE_NUM)

			iwl_cmd_queue_free(priv);

		else

			iwl_tx_queue_free(priv, txq_id);



}



void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv)

drivers/net/wireless/iwlwifi/iwl-core.h

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ void iwl_rx_reply_error(struct iwl_priv *priv, 
* RX

******************************************************/

void iwl_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq);

void iwl_cmd_queue_free(struct iwl_priv *priv);

int iwl_rx_queue_alloc(struct iwl_priv *priv);

void iwl_rx_handle(struct iwl_priv *priv);

int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv,

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

+4 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ EXPORT_SYMBOL(iwl_tx_queue_free); 
 * Free all buffers.

 * 0-fill, but do not free "txq" descriptor structure.

 */

static void iwl_cmd_queue_free(struct iwl_priv *priv)

void iwl_cmd_queue_free(struct iwl_priv *priv)

{

	struct iwl_tx_queue *txq = &priv->txq[IWL_CMD_QUEUE_NUM];

	struct iwl_queue *q = &txq->q;
@@ -193,12 +193,14 @@ static void iwl_cmd_queue_free(struct iwl_priv *priv) 


	/* De-alloc circular buffer of TFDs */

	if (txq->q.n_bd)

		pci_free_consistent(dev, sizeof(struct iwl_tfd) *

		pci_free_consistent(dev, priv->hw_params.tfd_size *

				    txq->q.n_bd, txq->tfds, txq->q.dma_addr);



	/* 0-fill queue descriptor structure */

	memset(txq, 0, sizeof(*txq));

}

EXPORT_SYMBOL(iwl_cmd_queue_free);



/*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****

 * DMA services

 *