samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Avoid setting SOURCE_DRIVER for non-BDF CC event

Browse Source 
Firmware could send same channel list for each pdev. Since SOURCE DRIVER
is default, it would be set for the second event. Avoid that. Remember the
source of the first event itself.

Change-Id: Ib9db58da1fa27673b04a4c62e10f2a05702348ad
CRs-Fixed: 2352151
This commit is contained in:
Amar Singhal
2018-11-12 11:24:10 -08:00
committed by nshrivas
parent 3ccfa6a645
commit 64ea8064b1
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
umac/regulatory/core/src/reg_services.c
View File

@@ -3220,12 +3220,8 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info
soc_reg->user_ctry_set = false; soc_reg->user_ctry_set = false;
reg_run_11d_state_machine(psoc); reg_run_11d_state_machine(psoc);
} else { } else {
soc_reg->cc_src = SOURCE_DRIVER; if (soc_reg->cc_src == SOURCE_UNKNOWN)
soc_reg->cc_src = SOURCE_DRIVER;
if (reg_is_world_alpha2(regulat_info->alpha2)) {
soc_reg->cc_src = SOURCE_CORE;
reg_run_11d_state_machine(psoc);
}
qdf_mem_copy(soc_reg->mas_chan_params[phy_id].default_country, qdf_mem_copy(soc_reg->mas_chan_params[phy_id].default_country,
regulat_info->alpha2, regulat_info->alpha2,
@@ -3236,12 +3232,20 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info
soc_reg->mas_chan_params[phy_id].def_region_domain = soc_reg->mas_chan_params[phy_id].def_region_domain =
regulat_info->reg_dmn_pair; regulat_info->reg_dmn_pair;
qdf_mem_copy(soc_reg->def_country, if (soc_reg->cc_src == SOURCE_DRIVER) {
regulat_info->alpha2, qdf_mem_copy(soc_reg->def_country,
REG_ALPHA2_LEN + 1); regulat_info->alpha2,
REG_ALPHA2_LEN + 1);
soc_reg->def_country_code = regulat_info->ctry_code; soc_reg->def_country_code = regulat_info->ctry_code;
soc_reg->def_region_domain = regulat_info->reg_dmn_pair; soc_reg->def_region_domain =
regulat_info->reg_dmn_pair;
}
if (reg_is_world_alpha2(regulat_info->alpha2)) {
soc_reg->cc_src = SOURCE_CORE;
reg_run_11d_state_machine(psoc);
}
} }
pdev = wlan_objmgr_get_pdev_by_id(psoc, phy_id, dbg_id); pdev = wlan_objmgr_get_pdev_by_id(psoc, phy_id, dbg_id);