Przeglądaj źródła

qcacld-3.0: fix mlo build error

Fix build error when enable WLAN_FEATURE_11BE_MLO

Change-Id: I73855838972a9edd6307dd1e55b05152c5435d69
CRs-Fixed: 2958496
bings 3 lat temu
rodzic
commit
5102c78190

+ 2 - 1
components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -2512,6 +2512,7 @@ bool policy_mgr_is_mlo_sap_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 	for (conn_index = 0; conn_index < MAX_NUMBER_OF_CONC_CONNECTIONS;
 		 conn_index++) {
 		if (pm_conc_connection_list[conn_index].in_use) {
+			vdev_id = pm_conc_connection_list[conn_index].vdev_id;
 			vdev = wlan_objmgr_get_vdev_by_id_from_psoc(
 					psoc, vdev_id, WLAN_POLICY_MGR_ID);
 			if (!vdev) {
@@ -2520,7 +2521,7 @@ bool policy_mgr_is_mlo_sap_concurrency_allowed(struct wlan_objmgr_psoc *psoc,
 				qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);
 				return ret;
 			}
-			if (wlan_vdev_mlme_is_mlo_sap(vdev))
+			if (wlan_vdev_mlme_is_mlo_ap(vdev))
 				mlo_sap_count++;
 			else
 				non_mlo_sap_count++;

+ 0 - 14
core/hdd/src/wlan_hdd_hostapd.c

@@ -5731,20 +5731,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	if (!cds_is_sub_20_mhz_enabled())
 		wlan_hdd_set_sap_hwmode(adapter);
 
-#ifdef WLAN_FEATURE_11BE_MLO
-	if (config->SapHw_mode == eCSR_DOT11_MODE_11be ||
-	    config->SapHw_mode == eCSR_DOT11_MODE_11be_ONLY) {
-		wlan_vdev_mlme_set_mlo_flag(adapter->vdev);
-		mlo_sap_update_with_config(); //TD
-	}
-
-	if (!policy_mgr_is_mlo_sap_concurrency_allowed(
-		hdd_ctx->psoc, wlan_vdev_mlme_is_mlo_sap(adapter->vdev))) {
-		hdd_err("MLO SAP concurrency check fails");
-		ret = -EINVAL;
-		goto error;
-	}
-#endif
 	status = ucfg_mlme_get_vht_for_24ghz(hdd_ctx->psoc, &bval);
 	if (QDF_IS_STATUS_ERROR(qdf_status))
 		hdd_err("Failed to get vht_for_24ghz");