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

qcacld-3.0: Clean-up regulatory code further

Browse Source 
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:
Amar Singhal
2016-08-22 16:50:01 -07:00
committed by Prakash Dhavali
parent 8c8fa7f7b7
commit 38c5eeb5f2
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/hdd/inc/wlan_hdd_main.h
View File

@@ -1309,8 +1309,6 @@ struct hdd_context_s {
/* Completion variable to indicate Mc Thread Suspended */ /* Completion variable to indicate Mc Thread Suspended */
struct completion mc_sus_event_var; struct completion mc_sus_event_var;
struct completion reg_init;
bool isMcThreadSuspended; bool isMcThreadSuspended;
#ifdef QCA_CONFIG_SMP #ifdef QCA_CONFIG_SMP

12
core/hdd/src/wlan_hdd_regulatory.c
View File

@@ -41,7 +41,6 @@
#define WORLD_SKU_MASK 0x00F0 #define WORLD_SKU_MASK 0x00F0
#define WORLD_SKU_PREFIX 0x0060 #define WORLD_SKU_PREFIX 0x0060
#define REG_WAIT_TIME 50
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS)
#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR #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); cds_put_default_country(reg_info->alpha2);
init_completion(&hdd_ctx->reg_init);
cds_fill_and_send_ctl_to_fw(reg_info); cds_fill_and_send_ctl_to_fw(reg_info);
hdd_set_dfs_region(hdd_ctx, DFS_FCC_REGION); 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) { if (false == init_by_reg_core) {
init_by_driver = true; init_by_driver = true;
if (('0' != country_alpha2[0]) || if (('0' != country_alpha2[0]) ||
('0' != country_alpha2[1])) { ('0' != country_alpha2[1]))
INIT_COMPLETION(hdd_ctx->reg_init);
regulatory_hint(wiphy, country_alpha2); 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); 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, sme_generic_change_country_code(hdd_ctx->hHal,
hdd_ctx->reg.alpha2); hdd_ctx->reg.alpha2);

4
core/sme/src/csr/csr_api_roam.c
View File

@@ -870,10 +870,6 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac)
" csr_start: Couldn't Init HO control blk "); " csr_start: Couldn't Init HO control blk ");
break; 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); } while (0);
return status; return status;
} }