Commit f7e3ab5c authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: add US/Canada MCC to API 



We don't want to duplicate the definitions later,
so add them to the API.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231219215605.6595e905997b.I12354d31676911b29ab30c81a4e9b87f59284d3b@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1c022d01

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ struct iwl_nvm_access_complete_cmd { 
	__le32 reserved;

} __packed; /* NVM_ACCESS_COMPLETE_CMD_API_S_VER_1 */



#define IWL_MCC_US	0x5553

#define IWL_MCC_CANADA	0x4341



/**

 * struct iwl_mcc_update_cmd - Request the device to update geographic

 * regulatory profile according to the given MCC (Mobile Country Code).

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

+2 −5
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ 
#define MVM_UCODE_ALIVE_TIMEOUT	(2 * HZ)

#define MVM_UCODE_CALIB_TIMEOUT	(2 * HZ)



#define IWL_TAS_US_MCC 0x5553

#define IWL_TAS_CANADA_MCC 0x4341



#define IWL_UATS_VLP_AP_SUPPORTED BIT(29)

#define IWL_UATS_AFC_AP_SUPPORTED BIT(30)
@@ -1234,10 +1231,10 @@ static void iwl_mvm_tas_init(struct iwl_mvm *mvm) 
				dmi_get_system_info(DMI_SYS_VENDOR));

		if ((!iwl_mvm_add_to_tas_block_list(cmd.v4.block_list_array,

						    &cmd.v4.block_list_size,

							IWL_TAS_US_MCC)) ||

							IWL_MCC_US)) ||

		    (!iwl_mvm_add_to_tas_block_list(cmd.v4.block_list_array,

						    &cmd.v4.block_list_size,

							IWL_TAS_CANADA_MCC))) {

							IWL_MCC_CANADA))) {

			IWL_DEBUG_RADIO(mvm,

					"Unable to add US/Canada to TAS block list, disabling TAS\n");

			return;