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

Commit 31f920b6 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: pcie: don't warn on long MPDUs when supported 



In iwlmvm firmwares, the Byte count written in the scheduler
byte count table is in DWORDs and not in bytes.
We should check that this value fits in the 12 bits and
the value can be either in bits of in DWORD or bytes
depending on the firmware. Check the value after the
translation to DWORDs is done (if needed).

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 33b56af1

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

+3 −2
Original line number Diff line number Diff line
@@ -219,8 +219,6 @@ static void iwl_pcie_txq_update_byte_cnt_tbl(struct iwl_trans *trans, 


	scd_bc_tbl = trans_pcie->scd_bc_tbls.addr;



	WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX);



	sta_id = tx_cmd->sta_id;

	sec_ctl = tx_cmd->sec_ctl;
@@ -239,6 +237,9 @@ static void iwl_pcie_txq_update_byte_cnt_tbl(struct iwl_trans *trans, 
	if (trans_pcie->bc_table_dword)

		len = DIV_ROUND_UP(len, 4);



	if (WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX))

		return;



	bc_ent = cpu_to_le16(len | (sta_id << 12));



	scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;