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

Commit 6c3fd3f0 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: don't leak Tx skb when a queue is disabled 



Since the queue might not be empty, we need to free the
pending Tx packets.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4e760f1a

drivers/net/wireless/iwlwifi/pcie/internal.h

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

void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id);

int iwl_queue_space(const struct iwl_queue *q);



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

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

+2 −2
Original line number Diff line number Diff line
@@ -442,10 +442,10 @@ static int iwl_trans_txq_init(struct iwl_trans *trans, struct iwl_tx_queue *txq, 
	return 0;

}



/**

/*

 * iwl_tx_queue_unmap -  Unmap any remaining DMA mappings and free skb's

 */

static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)

void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_tx_queue *txq = &trans_pcie->txq[txq_id];

drivers/net/wireless/iwlwifi/pcie/tx.c

+2 −0
Original line number Diff line number Diff line
@@ -494,6 +494,8 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id) 
	_iwl_write_targ_mem_dwords(trans, stts_addr,

				   zero_val, ARRAY_SIZE(zero_val));



	iwl_tx_queue_unmap(trans, txq_id);



	IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);

}