Просмотр исходного кода

qcacld-3.0: Reserve NAN vdev only when both fw/host enable NAN

On some platform, FW report NAN support capability always with the
share reason, but don't have to support NAN on some project so host
configure disable it.

We should check NAN reserve logic only when both fw/host enable it.

Change-Id: Ied9b6e292670b7d49ddcf691275410b95b7fd7bc
CRs-Fixed: 3142145
Will Huang 3 лет назад
Родитель
Сommit
985e21a72b
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      core/wma/src/wma_main.c

+ 2 - 1
core/wma/src/wma_main.c

@@ -6906,7 +6906,8 @@ int wma_rx_service_ready_ext_event(void *handle, uint8_t *event,
 	 * the num_vdevs by 1.
 	 */
 
-	if (wmi_service_enabled(wma_handle->wmi_handle, wmi_service_nan)) {
+	if (wmi_service_enabled(wma_handle->wmi_handle, wmi_service_nan) &&
+	    cfg_nan_get_enable(wma_handle->psoc)) {
 		if (ucfg_nan_is_vdev_creation_allowed(wma_handle->psoc) ||
 		    QDF_GLOBAL_FTM_MODE == cds_get_conparam()) {
 			wlan_res_cfg->nan_separate_iface_support = true;