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

qcacmn: Use channel and vdev_id array for get_mode_specific_conn_info

Browse Source 
Use channel and vdev_id array while calling
policy_mgr_get_mode_specific_conn_info.

Change-Id: I64579e2b1af0eca47af5292d456367d059a461f5
CRs-Fixed: 2238386
This commit is contained in:
Tushnim Bhattacharyya
2018-05-08 15:31:21 -07:00
committed by nshrivas
parent 783e038223
commit 54c0385480
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
umac/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c
View File

@@ -947,7 +947,9 @@ void policy_mgr_check_concurrent_intf_and_restart_sap(
{ {
struct policy_mgr_psoc_priv_obj *pm_ctx; struct policy_mgr_psoc_priv_obj *pm_ctx;
uint32_t mcc_to_scc_switch; uint32_t mcc_to_scc_switch;
uint8_t operating_channel, vdev_id; uint8_t operating_channel[MAX_NUMBER_OF_CONC_CONNECTIONS] = {0};
uint8_t vdev_id[MAX_NUMBER_OF_CONC_CONNECTIONS] = {0};
uint32_t cc_count = 0;
pm_ctx = policy_mgr_get_context(psoc); pm_ctx = policy_mgr_get_context(psoc);
if (!pm_ctx) { if (!pm_ctx) {
@@ -955,11 +957,13 @@ void policy_mgr_check_concurrent_intf_and_restart_sap(
return; return;
} }
if (policy_mgr_get_mode_specific_conn_info(psoc, &operating_channel, /*
&vdev_id, PM_STA_MODE)) { * force SCC with STA+STA+SAP will need some additional logic
policy_mgr_debug("STA operating Channel: %u", */
operating_channel); cc_count = policy_mgr_get_mode_specific_conn_info(psoc,
} else { &operating_channel[cc_count],
&vdev_id[cc_count], PM_STA_MODE);
if (!cc_count) {
policy_mgr_err("Could not get STA operating channel&vdevid"); policy_mgr_err("Could not get STA operating channel&vdevid");
return; return;
} }
@@ -967,7 +971,7 @@ void policy_mgr_check_concurrent_intf_and_restart_sap(
mcc_to_scc_switch = mcc_to_scc_switch =
policy_mgr_mcc_to_scc_switch_mode_in_user_cfg(psoc); policy_mgr_mcc_to_scc_switch_mode_in_user_cfg(psoc);
policy_mgr_info("MCC to SCC switch: %d chan: %d", policy_mgr_info("MCC to SCC switch: %d chan: %d",
mcc_to_scc_switch, operating_channel); mcc_to_scc_switch, operating_channel[0]);
if (!policy_mgr_is_restart_sap_allowed(psoc, mcc_to_scc_switch)) { if (!policy_mgr_is_restart_sap_allowed(psoc, mcc_to_scc_switch)) {
policy_mgr_debug( policy_mgr_debug(
@@ -976,7 +980,7 @@ void policy_mgr_check_concurrent_intf_and_restart_sap(
} }
if ((mcc_to_scc_switch != QDF_MCC_TO_SCC_SWITCH_DISABLE) && if ((mcc_to_scc_switch != QDF_MCC_TO_SCC_SWITCH_DISABLE) &&
policy_mgr_valid_sta_channel_check(psoc, operating_channel) policy_mgr_valid_sta_channel_check(psoc, operating_channel[0])
&& !pm_ctx->sta_ap_intf_check_work_info) { && !pm_ctx->sta_ap_intf_check_work_info) {
struct sta_ap_intf_check_work_ctx *work_info; struct sta_ap_intf_check_work_ctx *work_info;
work_info = qdf_mem_malloc( work_info = qdf_mem_malloc(