A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Restore target country code during SSR

Browse source 
During SSR, target country code is reset to default, may not same as
current country code, need restore it.

Change-Id: Ib8f51755f442d73ad6e11bbfb18fb22a60f724ba
CRs-Fixed: 2318283
This commit is contained in:
Jianmin Zhu 2018-10-17 19:32:51 +08:00 • committed by nshrivas
commit df8bb93d25
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
target_if/regulatory/src/target_if_reg.c
View file

@ -30,7 +30,6 @@
#include <target_if_reg.h>
#include <wmi_unified_reg_api.h>
#include <wlan_reg_ucfg_api.h>
#include <qdf_platform.h>
static inline uint32_t get_chan_list_cc_event_id(void)
{
@ -113,11 +112,6 @@ static int tgt_reg_chan_list_update_handler(ol_scn_t handle,
TARGET_IF_ENTER();
if (qdf_is_recovering()) {
target_if_debug("ignore chan list update evt in ssr");
return 0;
}
psoc = target_if_get_psoc_from_scn_hdl(handle);
if (!psoc) {
target_if_err("psoc ptr is NULL");

33
umac/regulatory/core/src/reg_services.c
View file

@ -27,6 +27,7 @@
#include "reg_host_11d.h"
#include <scheduler_api.h>
#include <wlan_reg_services_api.h>
#include <qdf_platform.h>
#define CHAN_12_CENT_FREQ 2467
#define MAX_PWR_FCC_CHAN_12 8
@ -1573,7 +1574,7 @@ QDF_STATUS reg_reset_country(struct wlan_objmgr_psoc *psoc)
qdf_mem_copy(psoc_reg->cur_country,
psoc_reg->def_country,
REG_ALPHA2_LEN + 1);
reg_debug("set cur_country %.2s", psoc_reg->cur_country);
return QDF_STATUS_SUCCESS;
}
@ -3046,8 +3047,7 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info
struct wlan_objmgr_pdev *pdev;
struct wlan_lmac_if_reg_tx_ops *tx_ops;
struct reg_rule_info *reg_rules;
reg_debug("process reg master chan list");
struct set_country country_code;
psoc = regulat_info->psoc;
soc_reg = reg_get_psoc_obj(psoc);
@ -3057,6 +3057,29 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info
return QDF_STATUS_E_FAILURE;
}
tx_ops = reg_get_psoc_tx_ops(psoc);
if (qdf_is_recovering()) {
if (soc_reg->offload_enabled &&
qdf_mem_cmp(soc_reg->cur_country,
regulat_info->alpha2,
REG_ALPHA2_LEN)) {
reg_debug("target cc:%.2s, restore %.2s to target",
regulat_info->alpha2,
soc_reg->cur_country);
qdf_mem_copy(country_code.country,
soc_reg->cur_country,
REG_ALPHA2_LEN + 1);
country_code.pdev_id = regulat_info->phy_id;
if (tx_ops && tx_ops->set_country_code)
tx_ops->set_country_code(psoc, &country_code);
}
reg_debug("ignore chan list update in ssr");
return QDF_STATUS_SUCCESS;
}
reg_debug("process reg master chan list");
phy_id = regulat_info->phy_id;
if (soc_reg->offload_enabled) {
@ -3078,7 +3101,6 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info
}
wlan_objmgr_pdev_release_ref(pdev, dbg_id);
tx_ops = reg_get_psoc_tx_ops(psoc);
if (tx_ops->set_country_failed)
tx_ops->set_country_failed(pdev);
@ -3117,6 +3139,7 @@ QDF_STATUS reg_process_master_chan_list(struct cur_regulatory_info
qdf_mem_copy(soc_reg->cur_country,
regulat_info->alpha2,
REG_ALPHA2_LEN + 1);
reg_debug("set cur_country %.2s", soc_reg->cur_country);
min_bw_2g = regulat_info->min_bw_2g;
max_bw_2g = regulat_info->max_bw_2g;
@ -4092,7 +4115,7 @@ void reg_program_mas_chan_list(struct wlan_objmgr_psoc *psoc,
qdf_mem_copy(psoc_priv_obj->cur_country, alpha2,
REG_ALPHA2_LEN);
reg_debug("set cur_country %.2s", psoc_priv_obj->cur_country);
for (count = 0; count < NUM_CHANNELS; count++) {
reg_channels[count].chan_num =
channel_map[count].chan_num;