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

Commit 77e569ed authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlagn: Fix a bug introduced by the HUGE command removal 



Since we don't have HUGE command any more, there is no point in adding 1
to the num of slots in the command queue. Doing so is buggy and might corrupt
memory.

Bug introduced by 4ce7cc2b
iwlagn: support multiple TBs per command

Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 3373b28e

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

+1 −6
Original line number Diff line number Diff line
@@ -535,12 +535,7 @@ out_free_arrays: 
void iwl_tx_queue_reset(struct iwl_priv *priv, struct iwl_tx_queue *txq,

			int slots_num, u32 txq_id)

{

	int actual_slots = slots_num;



	if (txq_id == priv->cmd_queue)

		actual_slots++;



	memset(txq->meta, 0, sizeof(struct iwl_cmd_meta) * actual_slots);

	memset(txq->meta, 0, sizeof(struct iwl_cmd_meta) * slots_num);



	txq->need_update = 0;