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

Commit dd4d3161 authored by Sara Sharon's avatar Sara Sharon Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: fix RSS key sizing 



The initialization and copying of the RSS secret key
should not use ARRAY_SIZE as we need to initialize a
dword array, and not a byte array.
Fix also the hook maximum write size to allow writing
a longer table - up to full indirection table size.

Fixes: 43413a97("iwlwifi: mvm: support rss queues configuration command")
Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 25c2b22c

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ static ssize_t iwl_dbgfs_indirection_tbl_write(struct iwl_mvm *mvm, 
	memcpy(&cmd.indirection_table[i * nbytes], cmd.indirection_table,

	       ARRAY_SIZE(cmd.indirection_table) % nbytes);



	memcpy(cmd.secret_key, mvm->secret_key, ARRAY_SIZE(cmd.secret_key));

	memcpy(cmd.secret_key, mvm->secret_key, sizeof(cmd.secret_key));



	mutex_lock(&mvm->mutex);

	ret = iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);
@@ -1497,7 +1497,8 @@ MVM_DEBUGFS_READ_WRITE_FILE_OPS(d0i3_refs, 8); 
MVM_DEBUGFS_READ_WRITE_FILE_OPS(fw_dbg_conf, 8);

MVM_DEBUGFS_WRITE_FILE_OPS(fw_dbg_collect, 64);

MVM_DEBUGFS_WRITE_FILE_OPS(cont_recording, 8);

MVM_DEBUGFS_WRITE_FILE_OPS(indirection_tbl, 16);

MVM_DEBUGFS_WRITE_FILE_OPS(indirection_tbl,

			   (IWL_RSS_INDIRECTION_TABLE_SIZE * 2));



#ifdef CONFIG_IWLWIFI_BCAST_FILTERING

MVM_DEBUGFS_READ_WRITE_FILE_OPS(bcast_filters, 256);

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int iwl_send_rss_cfg_cmd(struct iwl_mvm *mvm) 


	for (i = 0; i < ARRAY_SIZE(cmd.indirection_table); i++)

		cmd.indirection_table[i] = i % mvm->trans->num_rx_queues;

	memcpy(cmd.secret_key, mvm->secret_key, ARRAY_SIZE(cmd.secret_key));

	memcpy(cmd.secret_key, mvm->secret_key, sizeof(cmd.secret_key));



	return iwl_mvm_send_cmd_pdu(mvm, RSS_CONFIG_CMD, 0, sizeof(cmd), &cmd);

}

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
	iwl_mvm_tof_init(mvm);



	/* init RSS hash key */

	get_random_bytes(mvm->secret_key, ARRAY_SIZE(mvm->secret_key));

	get_random_bytes(mvm->secret_key, sizeof(mvm->secret_key));



	return op_mode;