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
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index cff2917..1357210 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1309,8 +1309,6 @@
/* Completion variable to indicate Mc Thread Suspended */
struct completion mc_sus_event_var;
- struct completion reg_init;
-
bool isMcThreadSuspended;
#ifdef QCA_CONFIG_SMP
diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c
index f92a225..133d229 100644
--- a/core/hdd/src/wlan_hdd_regulatory.c
+++ b/core/hdd/src/wlan_hdd_regulatory.c
@@ -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 @@
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 @@
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 @@
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);
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 5163353..67fd4a0 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -870,10 +870,6 @@
" 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;
}