From 88813478a1014b978edbbf5eb82feb55af9a4b99 Mon Sep 17 00:00:00 2001 From: Agrawal Ashish Date: Mon, 10 Oct 2016 13:01:09 +0530 Subject: [PATCH] qcacld-3.0: Remove redundant code for wma_set_cts2self_for_p2p_go SME is calling wma_set_cts2self_for_p2p_go directly. No need to post message to MC Thread. Change-Id: I335b1c8a6289560dbe6c0a3ccce60695922ff3ed CRs-Fixed: 1075981 --- core/mac/src/include/sir_params.h | 1 - core/sme/src/common/sme_api.c | 5 ----- core/wma/inc/wma_types.h | 1 - core/wma/src/wma_main.c | 2 -- 4 files changed, 9 deletions(-) diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index b11343f2be..bff7c7b1bc 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -635,7 +635,6 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_POWER_DBG_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 362) #define SIR_HAL_SET_DTIM_PERIOD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 363) #define SIR_HAL_ENCRYPT_DECRYPT_MSG (SIR_HAL_ITC_MSG_TYPES_BEGIN + 364) -#define SIR_HAL_SET_CTS2SELF_FOR_STA (SIR_HAL_ITC_MSG_TYPES_BEGIN + 368) #define SIR_HAL_MSG_TYPES_END (SIR_HAL_MSG_TYPES_BEGIN + 0x1FF) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 8795191b7c..16b2adbb10 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -16838,7 +16838,6 @@ QDF_STATUS sme_encrypt_decrypt_msg_deregister_callback(tHalHandle h_hal) QDF_STATUS sme_set_cts2self_for_p2p_go(tHalHandle hal_handle) { - cds_msg_t message; void *wma_handle; wma_handle = cds_get_context(QDF_MODULE_ID_WMA); @@ -16847,10 +16846,6 @@ QDF_STATUS sme_set_cts2self_for_p2p_go(tHalHandle hal_handle) "wma_handle is NULL"); return QDF_STATUS_E_FAILURE; } - - message.bodyptr = NULL; - message.type = WMA_SET_CTS2SELF_FOR_STA; - if (QDF_STATUS_SUCCESS != wma_set_cts2self_for_p2p_go(wma_handle, true)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 143bc5b53d..89f06c9db0 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -467,7 +467,6 @@ #define WMA_ADD_BCN_FILTER_CMDID SIR_HAL_ADD_BCN_FILTER_CMDID #define WMA_REMOVE_BCN_FILTER_CMDID SIR_HAL_REMOVE_BCN_FILTER_CMDID #define WMA_SET_ADAPT_DWELLTIME_CONF_PARAMS SIR_HAL_SET_ADAPT_DWELLTIME_PARAMS -#define WMA_SET_CTS2SELF_FOR_STA SIR_HAL_SET_CTS2SELF_FOR_STA #define WDA_BPF_GET_CAPABILITIES_REQ SIR_HAL_BPF_GET_CAPABILITIES_REQ #define WDA_BPF_SET_INSTRUCTIONS_REQ SIR_HAL_BPF_SET_INSTRUCTIONS_REQ diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index bc2b52d0b3..5f8bc9500e 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -6639,8 +6639,6 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WDA_BPF_SET_INSTRUCTIONS_REQ: wma_set_bpf_instructions(wma_handle, msg->bodyptr); qdf_mem_free(msg->bodyptr); - case WMA_SET_CTS2SELF_FOR_STA: - wma_set_cts2self_for_p2p_go(wma_handle, true); break; case SIR_HAL_NDP_INITIATOR_REQ: wma_handle_ndp_initiator_req(wma_handle, msg->bodyptr);