mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 16:46:15 -04:00
qcacld-3.0: Clean-up regulatory code further
Remove wait when sending regulatory_hint to kernel to get channel list. Also remove extra call to csr_update_channel_list from csr_start. Csr_ready already has call to csr_update_channel_list. Change-Id: I315ba2095fc7eb0faa1454cddcc9ee3f28b087bf CRs-Fixed: 1058399
This commit is contained in:
parent
8c8fa7f7b7
commit
38c5eeb5f2
3 changed files with 1 additions and 17 deletions
|
|
@ -1309,8 +1309,6 @@ struct hdd_context_s {
|
|||
/* Completion variable to indicate Mc Thread Suspended */
|
||||
struct completion mc_sus_event_var;
|
||||
|
||||
struct completion reg_init;
|
||||
|
||||
bool isMcThreadSuspended;
|
||||
|
||||
#ifdef QCA_CONFIG_SMP
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
#define WORLD_SKU_MASK 0x00F0
|
||||
#define WORLD_SKU_PREFIX 0x0060
|
||||
#define REG_WAIT_TIME 50
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS)
|
||||
#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR
|
||||
|
|
@ -508,8 +507,6 @@ int hdd_regulatory_init(hdd_context_t *hdd_ctx, struct wiphy *wiphy)
|
|||
|
||||
cds_put_default_country(reg_info->alpha2);
|
||||
|
||||
init_completion(&hdd_ctx->reg_init);
|
||||
|
||||
cds_fill_and_send_ctl_to_fw(reg_info);
|
||||
|
||||
hdd_set_dfs_region(hdd_ctx, DFS_FCC_REGION);
|
||||
|
|
@ -533,12 +530,8 @@ void hdd_program_country_code(hdd_context_t *hdd_ctx)
|
|||
if (false == init_by_reg_core) {
|
||||
init_by_driver = true;
|
||||
if (('0' != country_alpha2[0]) ||
|
||||
('0' != country_alpha2[1])) {
|
||||
INIT_COMPLETION(hdd_ctx->reg_init);
|
||||
('0' != country_alpha2[1]))
|
||||
regulatory_hint(wiphy, country_alpha2);
|
||||
wait_for_completion_timeout(&hdd_ctx->reg_init,
|
||||
msecs_to_jiffies(REG_WAIT_TIME));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -692,9 +685,6 @@ void hdd_reg_notifier(struct wiphy *wiphy,
|
|||
|
||||
hdd_process_regulatory_data(hdd_ctx, wiphy, reset);
|
||||
|
||||
if (NL80211_REGDOM_SET_BY_DRIVER == request->initiator)
|
||||
complete(&hdd_ctx->reg_init);
|
||||
|
||||
sme_generic_change_country_code(hdd_ctx->hHal,
|
||||
hdd_ctx->reg.alpha2);
|
||||
|
||||
|
|
|
|||
|
|
@ -870,10 +870,6 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac)
|
|||
" csr_start: Couldn't Init HO control blk ");
|
||||
break;
|
||||
}
|
||||
|
||||
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
|
||||
"Scan offload is enabled, update default chan list");
|
||||
status = csr_update_channel_list(pMac);
|
||||
} while (0);
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue