Merge "qcacld-3.0: Do not reserve NAN discovery vdev in case of FTM mode" into... (2561dc63) · Commits · e / devices / android_kernel_fairphone_FP5

core/wma/src/wma_main.c

+9 −5

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
		* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
		*
		* Permission to use, copy, modify, and/or distribute this software for
		* any purpose with or without fee is hereby granted, provided that the
		@@ -7031,12 +7032,15 @@ int wma_rx_service_ready_ext_event(void handle, uint8_t event,
		* indicate 3 vdevs and firmware shall add 1 vdev for NAN. So decrement
		* the num_vdevs by 1.
		*/

		if (QDF_GLOBAL_FTM_MODE != cds_get_conparam()) {
		if (ucfg_nan_is_vdev_creation_allowed(wma_handle->psoc)) {
		wlan_res_cfg->nan_separate_iface_support = true;
		} else {
		wlan_res_cfg->num_vdevs--;
		wma_update_num_peers_tids(wma_handle, wlan_res_cfg);
		}
		}

		if ((ucfg_pkt_capture_get_mode(wma_handle->psoc) !=
		PACKET_CAPTURE_MODE_DISABLE) &&