qcacld-3.0: Check MLO STA + NAN + NDP concurrency support

Check MLO STA + NAN + NDP concurrency support. Allow this
combination only If service cap and mlo sta presents.

Change-Id: I6fd0cae227eb8c4096444160b2450ad65dc51c30
CRs-Fixed: 3120645
This commit is contained in:
Jyoti Kumari
2021-12-29 11:38:03 +05:30
committed by Madan Koyyalamudi
parent e5b79679ef
commit b5c156c697

View File

@@ -1165,8 +1165,13 @@ bool ucfg_nan_is_sta_ndp_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
if (!sta_cnt)
return true;
/* Reject if STA+STA is present */
if (sta_cnt > 1) {
/* Reject STA+STA in below case
* Non-ML STA: STA+STA+NDP concurrency is not supported
* ML STA: As both links would be treated as separate STAs from
* policy mgr perspective, don't reject here and continue with further
* checks
*/
if (sta_cnt > 1 && !policy_mgr_is_mlo_sta_present(psoc)) {
nan_err("STA+STA+NDP concurrency is not allowed");
return false;
}
@@ -1179,6 +1184,13 @@ bool ucfg_nan_is_sta_ndp_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
if (is_sap_ndp_concurrency_allowed())
return true;
/* ML STA + NAN + NDP concurrency is allowed only if firmware
* support is present
*/
if (policy_mgr_is_mlo_sta_present(psoc) &&
!wlan_is_mlo_sta_nan_ndi_allowed(psoc))
return false;
ndi_cnt = policy_mgr_get_mode_specific_conn_info(psoc,
freq_list,
vdev_id_list,