From 8c68b47fa6efcb4e222c1b1b2ef4e1101b769c9c Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Thu, 15 Jun 2017 16:05:38 -0700 Subject: [PATCH] qcacld-3.0: Fix clang warnings in PE Fix implicit conversion from enumeration type 'enum eSirMacStatusCodes' to different enumeration type 'tSirResultCodes' (aka 'enum eSirResultCodes') Fix implicit conversion from enumeration type 'QDF_MODULE_ID' to different enumeration type 'CDS_MQ_ID' Fix implicit conversion from enumeration type 'enum eSirRetStatus' to different enumeration type 'tSirResultCodes' Fix implicit conversion from enumeration type 'QDF_STATUS' to different enumeration type 'tSirResultCodes' Fix implicit conversion from enumeration type 'tSirMacReasonCodes' (aka 'enum eSirMacReasonCodes') to different enumeration type 'tSirResultCodes' Change-Id: I2e769dcf34a54959082d8154b1e9377b356d2f5e CRs-Fixed: 2063149 --- core/mac/inc/mac_init_api.h | 4 ++-- core/mac/src/pe/lim/lim_api.c | 2 +- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 4 ++-- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 2 +- core/mac/src/sys/legacy/src/system/src/mac_init_api.c | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/mac/inc/mac_init_api.h b/core/mac/inc/mac_init_api.h index a439d19f58a4..6004c1eaca2b 100644 --- a/core/mac/inc/mac_init_api.h +++ b/core/mac/inc/mac_init_api.h @@ -42,9 +42,9 @@ #include "sir_types.h" tSirRetStatus mac_start(tHalHandle hHal, void *pHalMacStartParams); -tSirRetStatus mac_stop(tHalHandle hHal, tHalStopType stopType); +QDF_STATUS mac_stop(tHalHandle hHal, tHalStopType stopType); tSirRetStatus mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle, tHddHandle hHdd, struct cds_config_info *cds_cfg); -tSirRetStatus mac_close(tHalHandle hHal); +QDF_STATUS mac_close(tHalHandle hHal); #endif /* __MAC_INIT_API_H */ diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index b8041c982f9f..871ca6027756 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -479,7 +479,7 @@ static tSirRetStatus __lim_init_config(tpAniSirGlobal pMac) */ tSirRetStatus lim_start(tpAniSirGlobal pMac) { - tSirResultCodes retCode = eSIR_SUCCESS; + tSirRetStatus retCode = eSIR_SUCCESS; pe_debug("enter"); diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index b0cf98735fce..70d435a8743c 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -3205,7 +3205,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) case SIR_SCAN_EVENT_START_FAILED: if (ROC_SCAN_REQUESTOR_ID == pScanEvent->requestor) { lim_send_sme_roc_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP, - QDF_STATUS_SUCCESS, + eSIR_SME_SUCCESS, pScanEvent->sessionId, pScanEvent->scanId); qdf_mem_free(pMac->lim.gpLimRemainOnChanReq); @@ -3233,7 +3233,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) if (pMac->lim.gpLimRemainOnChanReq) { lim_send_sme_roc_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RDY_IND, - QDF_STATUS_SUCCESS, + eSIR_SME_SUCCESS, pScanEvent->sessionId, pScanEvent->scanId); } else { diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 2ae9522ce0de..329a9c6cfae5 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -3505,7 +3505,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type, sta_ds->mlmStaContext.subType, true, sta_ds->mlmStaContext.authType, sta_ds->assocId, true, - eSIR_MAC_UNSPEC_FAILURE_STATUS, + eSIR_SME_UNEXPECTED_REQ_RESULT_CODE, session_entry); } end: diff --git a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c index 3d4a6ee49d47..e6b7458b3460 100644 --- a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c +++ b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c @@ -83,13 +83,13 @@ tSirRetStatus mac_start(tHalHandle hHal, void *pHalMacStartParams) \return tSirRetStatus -------------------------------------------------------------*/ -tSirRetStatus mac_stop(tHalHandle hHal, tHalStopType stopType) +QDF_STATUS mac_stop(tHalHandle hHal, tHalStopType stopType) { tpAniSirGlobal pMac = (tpAniSirGlobal) hHal; pe_stop(pMac); cfg_cleanup(pMac); - return eSIR_SUCCESS; + return QDF_STATUS_SUCCESS; } /** ------------------------------------------------------------- @@ -157,13 +157,13 @@ tSirRetStatus mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle, \return none -------------------------------------------------------------*/ -tSirRetStatus mac_close(tHalHandle hHal) +QDF_STATUS mac_close(tHalHandle hHal) { tpAniSirGlobal pMac = (tpAniSirGlobal) hHal; if (!pMac) - return eSIR_FAILURE; + return QDF_STATUS_E_FAILURE; pe_close(pMac); @@ -177,5 +177,5 @@ tSirRetStatus mac_close(tHalHandle hHal) wlan_objmgr_psoc_release_ref(pMac->psoc, WLAN_LEGACY_MAC_ID); pMac->psoc = NULL; - return eSIR_SUCCESS; + return QDF_STATUS_SUCCESS; }