diff options
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/fw/regulatory.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c index 4b5eeff4a140..c89ff380b86d 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c @@ -426,10 +426,12 @@ IWL_EXPORT_SYMBOL(iwl_is_tas_approved); int iwl_parse_tas_selection(struct iwl_fw_runtime *fwrt, struct iwl_tas_data *tas_data, - const u32 tas_selection) + const u32 tas_selection, u8 tbl_rev) { u8 override_iec = u32_get_bits(tas_selection, IWL_WTAS_OVERRIDE_IEC_MSK); + u8 canada_tas_uhb = u32_get_bits(tas_selection, + IWL_WTAS_CANADA_UHB_MSK); u8 enabled_iec = u32_get_bits(tas_selection, IWL_WTAS_ENABLE_IEC_MSK); u8 usa_tas_uhb = u32_get_bits(tas_selection, IWL_WTAS_USA_UHB_MSK); int enabled = tas_selection & IWL_WTAS_ENABLED_MSK; @@ -441,6 +443,9 @@ int iwl_parse_tas_selection(struct iwl_fw_runtime *fwrt, tas_data->override_tas_iec = override_iec; tas_data->enable_tas_iec = enabled_iec; + if (tbl_rev > 1) + tas_data->canada_tas_uhb_allowed = canada_tas_uhb; + return enabled; } |