From 7b2a6573610a962f8e844147bdc19863de12b0d4 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Thu, 15 Jun 2017 11:07:28 -0700 Subject: [PATCH] qcacld-3.0: Fix clang warnings in SME Fix implicit conversion from enumeration type 'tSirRetStatus' (aka 'enum eSirRetStatus') to different enumeration type 'QDF_STATUS' Fix implicit conversion from enumeration type 'QDF_MODULE_ID' to different enumeration type 'CDS_MQ_ID' Fix implicit conversion from enumeration type 'enum eSirResultCodes' to different enumeration type 'eCsrRoamResult' Fix implicit conversion from enumeration type 'enum eSirRetStatus' to different enumeration type 'tSirMacStatusCodes' Fix implicit conversion from enumeration type 'sme_QosStatusType' to different enumeration type 'QDF_STATUS' Fix implicit conversion from enumeration type 'tSirResultCodes' (aka 'enum eSirResultCodes') to different enumeration type 'QDF_STATUS' Change-Id: I133992192b797619c7bc593fb65e4ca5ca87702b CRs-Fixed: 2063149 --- core/sme/inc/csr_api.h | 1 + core/sme/src/common/sme_api.c | 7 ++++--- core/sme/src/common/sme_power_save.c | 2 +- core/sme/src/csr/csr_api_roam.c | 26 ++++++++++++++------------ core/sme/src/csr/csr_api_scan.c | 17 ++++++++++------- core/sme/src/csr/csr_host_scan_roam.c | 2 +- core/sme/src/qos/sme_qos.c | 8 +++----- 7 files changed, 34 insertions(+), 29 deletions(-) diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 6632286c84c1..837a4e39b79e 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -527,6 +527,7 @@ typedef enum { /* comment inside indicates what roaming callback gets */ typedef enum { eCSR_ROAM_RESULT_NONE, + eCSR_ROAM_RESULT_SUCCESS = eCSR_ROAM_RESULT_NONE, /* * If roamStatus is eCSR_ROAM_ASSOCIATION_COMPLETION, * tCsrRoamInfo's pBssDesc may pass back diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 719635ab6f5b..09a7a900b692 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1823,7 +1823,7 @@ QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, const tCsrEseBeaconReq *pEseBcnReq) { - QDF_STATUS status = eSIR_SUCCESS; + QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpSirBeaconReportReqInd pSmeBcnReportReq = NULL; tCsrEseBeaconReqParams *pBeaconReq = NULL; @@ -4584,8 +4584,9 @@ QDF_STATUS sme_wow_add_pattern(tHalHandle hal, if (eSIR_SUCCESS != ret_code) { sme_err("Posting WMA_WOWL_ADD_BCAST_PTRN failed, reason: %X", ret_code); + return QDF_STATUS_E_FAILURE; } - return ret_code; + return QDF_STATUS_SUCCESS; } /** @@ -13451,7 +13452,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, (scheduler_post_msg(QDF_MODULE_ID_WMA, &message))) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!", + "%s:WMA_SET_DHCP_SERVER_OFFLOAD_CMD failed", __func__); qdf_mem_free(pSmeDhcpSrvInfo); status = QDF_STATUS_E_FAILURE; diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index ed87cd8b37fe..0d4b96180d6c 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -440,7 +440,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) { sme_err("Invalid Session_id: %d", session_id); - return eSIR_FAILURE; + return QDF_STATUS_E_INVAL; } QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Power Save command %d"), command); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index cee26ed540a8..752d58b37fdf 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -9251,10 +9251,10 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, if (pNeighborRoamInfo) { qdf_mem_zero(&roamInfo, sizeof(tCsrRoamInfo)); csr_roam_call_callback(pMac, - pSmeJoinRsp->sessionId, - &roamInfo, roamId, - eCSR_ROAM_FT_REASSOC_FAILED, - eSIR_SME_SUCCESS); + pSmeJoinRsp->sessionId, + &roamInfo, roamId, + eCSR_ROAM_FT_REASSOC_FAILED, + eCSR_ROAM_RESULT_SUCCESS); /* * Since the above callback sends a disconnect * to HDD, we should clean-up our state @@ -9402,7 +9402,8 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, /* Inform the upper layers that the reassoc failed */ qdf_mem_zero(roam_info, sizeof(tCsrRoamInfo)); csr_roam_call_callback(mac_ctx, session_id, roam_info, 0, - eCSR_ROAM_FT_REASSOC_FAILED, eSIR_SME_SUCCESS); + eCSR_ROAM_FT_REASSOC_FAILED, + eCSR_ROAM_RESULT_SUCCESS); /* * Issue a disassoc request so that PE/LIM uses this to clean-up the FT * session. Upon success, we would re-enter this routine after receiving @@ -15847,7 +15848,7 @@ csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, { struct del_sta_self_params *del_sta_self_req; struct scheduler_msg msg = {0}; - QDF_STATUS status = QDF_STATUS_E_FAILURE; + tSirRetStatus status; del_sta_self_req = qdf_mem_malloc(sizeof(struct del_sta_self_params)); if (NULL == del_sta_self_req) { @@ -15868,11 +15869,12 @@ csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, sme_debug("sending WMA_DEL_STA_SELF_REQ"); status = wma_post_ctrl_msg(pMac, &msg); - if (status != QDF_STATUS_SUCCESS) { + if (status != eSIR_SUCCESS) { sme_err("wma_post_ctrl_msg failed"); qdf_mem_free(del_sta_self_req); + return QDF_STATUS_E_FAILURE; } - return status; + return QDF_STATUS_SUCCESS; } void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId) @@ -19738,24 +19740,24 @@ static QDF_STATUS csr_process_roam_sync_callback(tpAniSirGlobal mac_ctx, return QDF_STATUS_E_FAILURE; } csr_roam_call_callback(mac_ctx, session_id, NULL, 0, - eCSR_ROAM_FT_START, eSIR_SME_SUCCESS); + eCSR_ROAM_FT_START, eCSR_ROAM_RESULT_SUCCESS); return status; case SIR_ROAMING_START: csr_roam_roaming_offload_timer_action(mac_ctx, CSR_ROAMING_OFFLOAD_TIMEOUT_PERIOD, session_id, ROAMING_OFFLOAD_TIMER_START); csr_roam_call_callback(mac_ctx, session_id, NULL, 0, - eCSR_ROAM_START, eSIR_SME_SUCCESS); + eCSR_ROAM_START, eCSR_ROAM_RESULT_SUCCESS); return status; case SIR_ROAMING_ABORT: csr_roam_roaming_offload_timer_action(mac_ctx, 0, session_id, ROAMING_OFFLOAD_TIMER_STOP); csr_roam_call_callback(mac_ctx, session_id, NULL, 0, - eCSR_ROAM_ABORT, eSIR_SME_SUCCESS); + eCSR_ROAM_ABORT, eCSR_ROAM_RESULT_SUCCESS); return status; case SIR_ROAM_SYNCH_NAPI_OFF: csr_roam_call_callback(mac_ctx, session_id, NULL, 0, - eCSR_ROAM_NAPI_OFF, eSIR_SME_SUCCESS); + eCSR_ROAM_NAPI_OFF, eCSR_ROAM_RESULT_SUCCESS); return status; case SIR_ROAMING_INVOKE_FAIL: csr_roam_call_callback(mac_ctx, session_id, NULL, 0, diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index ea915e97f0db..07489434d267 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -3380,13 +3380,14 @@ static QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, } if (CSR_ROAM_SESSION_MAX == i) { uint32_t len = QDF_MAC_ADDR_SIZE; + tSirRetStatus sir_status; - status = wlan_cfg_get_str(pMac, WNI_CFG_STA_ID, + sir_status = wlan_cfg_get_str(pMac, WNI_CFG_STA_ID, selfmac.bytes, &len); - if (!QDF_IS_STATUS_SUCCESS(status) + if ((sir_status != eSIR_SUCCESS) || (len < QDF_MAC_ADDR_SIZE)) { - sme_err("Can't get self MAC address: %d", - status); + sme_err("Can't get self MAC: status:%d len:%d", + sir_status, len); status = QDF_STATUS_E_FAILURE; goto send_scan_req; } @@ -4603,18 +4604,20 @@ static void csr_set_cfg_country_code(tpAniSirGlobal pMac, uint8_t *countryCode) QDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, uint8_t *pbLen) { - QDF_STATUS status = QDF_STATUS_E_INVAL; + tSirRetStatus status; uint32_t len; if (pBuf && pbLen && (*pbLen >= WNI_CFG_COUNTRY_CODE_LEN)) { len = *pbLen; status = wlan_cfg_get_str(pMac, WNI_CFG_COUNTRY_CODE, pBuf, &len); - if (QDF_IS_STATUS_SUCCESS(status)) + if (status == eSIR_SUCCESS) { *pbLen = (uint8_t) len; + return QDF_STATUS_SUCCESS; + } } - return status; + return QDF_STATUS_E_INVAL; } void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c index 1ac0d1868662..2f1c656592c0 100644 --- a/core/sme/src/csr/csr_host_scan_roam.c +++ b/core/sme/src/csr/csr_host_scan_roam.c @@ -616,7 +616,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); csr_roam_call_callback(mac_ctx, session_id, &roam_info, roamid, - eCSR_ROAM_FT_START, eSIR_SME_SUCCESS); + eCSR_ROAM_FT_START, eCSR_ROAM_RESULT_SUCCESS); qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); csr_neighbor_roam_state_transition(mac_ctx, diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 993eefb6ec30..bf0d34686e35 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -2962,7 +2962,7 @@ sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionId, pAddtsRsp->rc = eSIR_SUCCESS; pAddtsRsp->sessionId = sessionId; pAddtsRsp->rsp.dialogToken = 0; - pAddtsRsp->rsp.status = eSIR_SUCCESS; + pAddtsRsp->rsp.status = eSIR_MAC_SUCCESS_STATUS; pAddtsRsp->rsp.wmeTspecPresent = pTspec->present; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d", @@ -6771,7 +6771,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) if (!QDF_IS_STATUS_SUCCESS(lock_status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); - return SME_QOS_STATUS_RELEASE_FAILURE_RSP; + return QDF_STATUS_E_FAILURE; } /* Call the internal function for QoS release, adding a layer of abstraction */ status = @@ -7538,10 +7538,8 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sme_qos_add_ts_req(pMac, (uint8_t) pCommand->sessionId, &pCommand->u.qosCmd.tspecInfo, pCommand->u.qosCmd.ac); - if (QDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) fRemoveCmd = false; - status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; - } break; case eSmeCommandDelTs: status =