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

Commit b4f48985 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: rename iwl_shared_mem_cfg_v1 to the correct _v2 



This structure represents V2, V1 has the three last fields missing.
Rename it to be more accurate.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 92c4dca6

drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h

+3 −3
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ enum iwl_system_subcmd_ids { 
	/**

	 * @SHARED_MEM_CFG_CMD:

	 * response in &struct iwl_shared_mem_cfg or

	 * &struct iwl_shared_mem_cfg_v1

	 * &struct iwl_shared_mem_cfg_v2

	 */

	SHARED_MEM_CFG_CMD = 0x0,
@@ -2546,7 +2546,7 @@ struct iwl_tdls_config_res { 
#define TX_FIFO_INTERNAL_MAX_NUM	6



/**

 * struct iwl_shared_mem_cfg_v1 - Shared memory configuration information

 * struct iwl_shared_mem_cfg_v2 - Shared memory configuration information

 *

 * @shared_mem_addr: shared memory addr (pre 8000 HW set to 0x0 as MARBH is not

 *	accessible)
@@ -2568,7 +2568,7 @@ struct iwl_tdls_config_res { 
 * NOTE: on firmware that don't have IWL_UCODE_TLV_CAPA_EXTEND_SHARED_MEM_CFG

 *	 set, the last 3 members don't exist.

 */

struct iwl_shared_mem_cfg_v1 {

struct iwl_shared_mem_cfg_v2 {

	__le32 shared_mem_addr;

	__le32 shared_mem_size;

	__le32 sample_buff_addr;

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

+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ static void iwl_mvm_parse_shared_mem_a000(struct iwl_mvm *mvm, 
static void iwl_mvm_parse_shared_mem(struct iwl_mvm *mvm,

				     struct iwl_rx_packet *pkt)

{

	struct iwl_shared_mem_cfg_v1 *mem_cfg = (void *)pkt->data;

	struct iwl_shared_mem_cfg_v2 *mem_cfg = (void *)pkt->data;

	int i;



	mvm->smem_cfg.num_lmacs = 1;