From 08efa3ad754477db16cd916e70fd9b3a0feb37bb Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Tue, 3 Nov 2015 16:59:57 -0800 Subject: [PATCH] qcacld-3.0: In FTM mode stopping the MAC is not needed qcacld-2.0 to qcacld-3.0 propagation The MAC is not started upon FTM start. Similarly stopping is not needed during FTM stop. CRs-Fixed: 917306 Change-Id: I72ee4a58c88b54c1dad1b82f749274e0c2e8a9ce --- core/hdd/src/wlan_hdd_ftm.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index c002991115bc..bf285c00975d 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -620,41 +620,17 @@ err_adapter_open_failure: * @hdd_ctx: pointer to HDD context * * This function stops the following modules - * 1. MAC - * 2. WMA + * WMA * * Return: 0 on success, non-zero on failure */ static int wlan_ftm_stop(hdd_context_t *hdd_ctx) { - CDF_STATUS cdf_status; - if (hdd_ctx->ftm.ftm_state != WLAN_FTM_STARTED) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, - "%s:Ftm has not started. Please start the ftm. ", - __func__); + hddLog(LOGP, FL("FTM has not started. No need to stop")); return -EPERM; } - - { - /* STOP MAC only */ - void *hHal; - hHal = cds_get_context(CDF_MODULE_ID_SME); - if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: NULL hHal", __func__); - } else { - cdf_status = - mac_stop(hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, - CDF_TRACE_LEVEL_ERROR, - "%s: Failed to stop SYS", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); - } - } - wma_stop(hdd_ctx->pcds_context, HAL_STOP_TYPE_RF_KILL); - } + wma_stop(hdd_ctx->pcds_context, HAL_STOP_TYPE_RF_KILL); return 0; }