diff options
| author | Amar Singhal <asinghal@codeaurora.org> | 2016-08-22 16:50:01 -0700 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-11-07 13:13:43 -0800 |
| commit | c4a9996fc02040336d346e267d2ed8537839b981 (patch) | |
| tree | 26248c1ed0fe3c00a0ab461677acf2151007cd7e | |
| parent | 095d1b4e37577594d6926acce3dd8c7900d32403 (diff) | |
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
| -rw-r--r-- | core/hdd/inc/wlan_hdd_main.h | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_regulatory.c | 12 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_api_roam.c | 4 |
3 files changed, 1 insertions, 17 deletions
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index cff291704cd1..13572103286b 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -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 diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index f92a225429e6..133d229d8c31 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 @@ 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); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 51633530ec6e..67fd4a0e3fc4 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -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; } |