From c09caa4db6f47453ab1c04e69b1560710b56c8d3 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 7 Jun 2018 22:58:55 -0700 Subject: [PATCH] qcacld-3.0: sme: Replace tSirRetStatus with QDF_STATUS The tSirRetStatus definitions are obsolete, so replace them with QDF_STATUS definitions in the sme folder. Change-Id: Ib47c297fb19c350f6ccb7d2c433ebb0eac36b2c4 CRs-Fixed: 2263024 --- core/sme/inc/csr_neighbor_roam.h | 2 +- core/sme/inc/sme_power_save_api.h | 4 +-- core/sme/src/common/sme_api.c | 28 +++++++----------- core/sme/src/common/sme_power_save.c | 8 ++--- core/sme/src/csr/csr_api_roam.c | 44 ++++++++++++++-------------- core/sme/src/csr/csr_api_scan.c | 6 ++-- core/sme/src/csr/csr_roam_preauth.c | 10 +++---- core/sme/src/qos/sme_qos.c | 2 +- core/sme/src/rrm/sme_rrm.c | 4 +-- 9 files changed, 51 insertions(+), 57 deletions(-) diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 8e033393fff2..7627a96e197e 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -179,7 +179,7 @@ QDF_STATUS csrNeighborRoamTransitionToPreauthDone(tpAniSirGlobal pMac); QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter, uint8_t sessionId); QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal pMac, - uint8_t sessionId, tSirRetStatus limStatus); + uint8_t sessionId, QDF_STATUS limStatus); bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId); #ifdef WLAN_FEATURE_HOST_ROAM void csr_neighbor_roam_tranistion_preauth_done_to_disconnected( diff --git a/core/sme/inc/sme_power_save_api.h b/core/sme/inc/sme_power_save_api.h index 199d29c643f7..8b8b1466def7 100644 --- a/core/sme/inc/sme_power_save_api.h +++ b/core/sme/inc/sme_power_save_api.h @@ -60,8 +60,8 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, #endif /* WLAN_NS_OFFLOAD */ /* / Post a message to PE module */ -tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, - struct scheduler_msg *pMsg); +QDF_STATUS sme_post_pe_message(tpAniSirGlobal mac_ctx, + struct scheduler_msg *pMsg); /** * sme_ps_enable_auto_ps_timer(): Enable power-save auto timer with timeout diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 1230113f34b3..8a64bdea1e2e 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1170,16 +1170,14 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) msg->csr_roam_synch_cb = csr_roam_synch_callback; msg->sme_msg_cb = sme_process_msg_callback; - if (eSIR_FAILURE != u_mac_post_ctrl_msg(hHal, (tSirMbMsg *) - msg)) { - status = QDF_STATUS_SUCCESS; - } else { + status = u_mac_post_ctrl_msg(hHal, (tSirMbMsg *)msg); + if (QDF_IS_STATUS_ERROR(status)) { sme_err("u_mac_post_ctrl_msg failed to send eWNI_SME_SYS_READY_IND"); break; } status = csr_ready(pMac); - if (!QDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_ERROR(status)) { sme_err("csr_ready failed with status: %d", status); break; } @@ -1193,7 +1191,6 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) QDF_STATUS sme_get_valid_channels(uint8_t *chan_list, uint32_t *list_len) { tpAniSirGlobal mac_ctx = sme_get_mac_context(); - QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == mac_ctx) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -1201,11 +1198,8 @@ QDF_STATUS sme_get_valid_channels(uint8_t *chan_list, uint32_t *list_len) return QDF_STATUS_E_FAILURE; } - if (eSIR_SUCCESS != wlan_cfg_get_str(mac_ctx, - WNI_CFG_VALID_CHANNEL_LIST, chan_list, list_len)) - status = QDF_STATUS_E_INVAL; - - return status; + return wlan_cfg_get_str(mac_ctx, WNI_CFG_VALID_CHANNEL_LIST, + chan_list, list_len); } #ifdef WLAN_CONV_SPECTRAL_ENABLE @@ -3800,7 +3794,7 @@ QDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value) tpAniSirGlobal pmac = PMAC_STRUCT(hal); QDF_STATUS status = QDF_STATUS_SUCCESS; - if (eSIR_SUCCESS != cfg_set_int(pmac, cfg_id, value)) + if (QDF_STATUS_SUCCESS != cfg_set_int(pmac, cfg_id, value)) status = QDF_STATUS_E_FAILURE; return status; @@ -3823,7 +3817,7 @@ QDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, tpAniSirGlobal pmac = PMAC_STRUCT(hal); QDF_STATUS status = QDF_STATUS_SUCCESS; - if (eSIR_SUCCESS != cfg_set_str(pmac, cfg_id, str, length)) + if (QDF_STATUS_SUCCESS != cfg_set_str(pmac, cfg_id, str, length)) status = QDF_STATUS_E_FAILURE; return status; @@ -3845,7 +3839,7 @@ QDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value) tpAniSirGlobal pmac = PMAC_STRUCT(hal); QDF_STATUS status = QDF_STATUS_SUCCESS; - if (eSIR_SUCCESS != wlan_cfg_get_int(pmac, cfg_id, cfg_value)) + if (QDF_STATUS_SUCCESS != wlan_cfg_get_int(pmac, cfg_id, cfg_value)) status = QDF_STATUS_E_FAILURE; return status; @@ -3868,7 +3862,7 @@ QDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, tpAniSirGlobal pmac = PMAC_STRUCT(hal); QDF_STATUS status = QDF_STATUS_SUCCESS; - if (eSIR_SUCCESS != wlan_cfg_get_str(pmac, cfg_id, str, length)) + if (QDF_STATUS_SUCCESS != wlan_cfg_get_str(pmac, cfg_id, str, length)) status = QDF_STATUS_E_INVAL; return status; @@ -6955,7 +6949,7 @@ QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, QDF_STATUS sme_stop_roaming(tHalHandle hal, uint8_t session_id, uint8_t reason) { struct scheduler_msg wma_msg = {0}; - tSirRetStatus status; + QDF_STATUS status; tSirRoamOffloadScanReq *req; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); tpCsrNeighborRoamControlInfo roam_info; @@ -7005,7 +6999,7 @@ QDF_STATUS sme_stop_roaming(tHalHandle hal, uint8_t session_id, uint8_t reason) wma_msg.bodyptr = req; status = wma_post_ctrl_msg(mac_ctx, &wma_msg); - if (eSIR_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sme_err("WMA_ROAM_SCAN_OFFLOAD_REQ failed, session_id: %d", session_id); qdf_mem_free(req); diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 534ef8079300..4c7e8378edb1 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -714,8 +714,8 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, * @return None */ -tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, - struct scheduler_msg *msg) +QDF_STATUS sme_post_pe_message(tpAniSirGlobal mac_ctx, + struct scheduler_msg *msg) { QDF_STATUS qdf_status; @@ -724,10 +724,10 @@ tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sme_err("scheduler_post_msg failed with status: %d", qdf_status); - return eSIR_FAILURE; + return QDF_STATUS_E_FAILURE; } - return eSIR_SUCCESS; + return QDF_STATUS_SUCCESS; } QDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index b4b280575de5..4bfcbe9a0a49 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -4398,7 +4398,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, roam_info->pBssDesc->channelId; } if (cfg_set_int(pMac, WNI_CFG_CURRENT_RSSI, - connectionStatus.rssi) == eSIR_FAILURE) + connectionStatus.rssi) == QDF_STATUS_E_FAILURE) sme_err("Can't pass WNI_CFG_CURRENT_RSSI to cfg"); connectionStatus.qosCapability = @@ -4423,7 +4423,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, || (eCSR_ROAM_RESULT_MIC_FAILURE == u2)) { qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) connectionStatus.rssi = rssi; @@ -4435,7 +4435,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, if (eCSR_ROAM_RESULT_FORCED == u2) { qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) connectionStatus.rssi = rssi; @@ -4447,7 +4447,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, if (eCSR_ROAM_RESULT_DISASSOC_IND == u2) { qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) connectionStatus.rssi = rssi; @@ -4463,7 +4463,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, if (eCSR_ROAM_RESULT_DEAUTH_IND == u2) { qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) connectionStatus.rssi = rssi; @@ -5551,7 +5551,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, struct sDot11fBeaconIEs *pIes, bool resetCountry) { - tSirRetStatus status; + QDF_STATUS status; uint32_t cfgCb = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE; uint8_t channel = 0; struct csr_roam_session *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -7387,7 +7387,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, ibss_log->operatingChannel = bss_desc->channelId; } - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int( + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_int( mac_ctx, WNI_CFG_BEACON_INTERVAL, &bi))) @@ -9924,7 +9924,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, return; } - if (!IS_SIR_STATUS_SUCCESS(result)) { + if (!QDF_IS_STATUS_SUCCESS(result)) { /* * In the event the configuration failed, for infra let the roam * processor attempt to join something else... @@ -11141,7 +11141,7 @@ QDF_STATUS csr_roam_send_set_key_cmd(tpAniSirGlobal mac_ctx, if (CSR_IS_ENC_TYPE_STATIC(set_key_cmd->encType)) { uint32_t defKeyId; /* It has to be static WEP here */ - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(mac_ctx, + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_int(mac_ctx, WNI_CFG_WEP_DEFAULT_KEYID, &defKeyId))) { setKeyEvent.keyId = (uint8_t) defKeyId; @@ -12148,7 +12148,7 @@ csr_roam_diag_joined_new_bss(tpAniSirGlobal mac_ctx, pNewBss->ssId.length); pIbssLog->operatingChannel = pNewBss->channelNumber; } - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(mac_ctx, + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_int(mac_ctx, WNI_CFG_BEACON_INTERVAL, &bi))) /* U8 is not enough for beacon interval */ @@ -13524,7 +13524,7 @@ QDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, uint8_t num_chan_temp = 0; int i; - if (!IS_SIR_STATUS_SUCCESS(wlan_cfg_get_str(pMac, + if (!QDF_IS_STATUS_SUCCESS(wlan_cfg_get_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, (uint8_t *) pChannels, pNumChan))) return QDF_STATUS_E_FAILURE; @@ -13572,7 +13572,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) goto error; } if (wlan_cfg_get_str(pMac, cfgId, (uint8_t *)pCountryInfo, - &cfgLength) != eSIR_SUCCESS) { + &cfgLength) != QDF_STATUS_SUCCESS) { goto error; } /* Identify the channel and maxtxpower */ @@ -15807,12 +15807,12 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } if (wlan_cfg_get_int(pMac, WNI_CFG_VHT_SU_BEAMFORMEE_CAP, - &value) != eSIR_SUCCESS) + &value) != QDF_STATUS_SUCCESS) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Failed to get SU beamformee capability")); if (wlan_cfg_get_int(pMac, WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED, - &value1) != eSIR_SUCCESS) + &value1) != QDF_STATUS_SUCCESS) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Failed to get CSN beamformee capability")); @@ -15844,7 +15844,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (wlan_cfg_get_int(pMac, WNI_CFG_VHT_SU_BEAMFORMER_CAP, &value) - != eSIR_SUCCESS) + != QDF_STATUS_SUCCESS) sme_err("Failed to get SU beamformer capability"); /* @@ -15867,7 +15867,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (wlan_cfg_get_int(pMac, WNI_CFG_VHT_MU_BEAMFORMEE_CAP, &value) - != eSIR_SUCCESS) + != QDF_STATUS_SUCCESS) sme_err("Failed to get CSN beamformee capability"); /* * Set MU Bformee only if SU Bformee is enabled and @@ -16676,7 +16676,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sizeof(tSirHTConfig)); if (wlan_cfg_get_int(pMac, WNI_CFG_VHT_SU_BEAMFORMEE_CAP, &value) - != eSIR_SUCCESS) + != QDF_STATUS_SUCCESS) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "could not get SU beam formee capability"); pMsg->vht_config.su_beam_formee = @@ -16684,7 +16684,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t (uint8_t)pMac->roam.configParam.enable_txbf_sap_mode; if (wlan_cfg_get_int(pMac, WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED, - &value) != eSIR_SUCCESS) + &value) != QDF_STATUS_SUCCESS) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Failed to get CSN beamformee capability")); pMsg->vht_config.csnof_beamformer_antSup = (uint8_t)value; @@ -17032,7 +17032,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal mac_ctx, /* get the HT capability info */ if (wlan_cfg_get_int(mac_ctx, WNI_CFG_HT_CAP_INFO, &nCfgValue) != - eSIR_SUCCESS) { + QDF_STATUS_SUCCESS) { sme_err("could not get HT capability info"); return QDF_STATUS_SUCCESS; } @@ -17181,7 +17181,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}; tp_wma_handle wma_handle = cds_get_context(QDF_MODULE_ID_WMA); - tSirRetStatus status; + QDF_STATUS status; if (!wma_handle) { sme_err("wma handle is NULL"); @@ -17217,7 +17217,7 @@ 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 != eSIR_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sme_err("wma_post_ctrl_msg failed"); qdf_mem_free(del_sta_self_req); return QDF_STATUS_E_FAILURE; @@ -18030,7 +18030,7 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, (uint32_t *) &req_buf->ReassocFailureTimeout) - != eSIR_SUCCESS) { + != QDF_STATUS_SUCCESS) { sme_err( "could not retrieve ReassocFailureTimeout value"); req_buf->ReassocFailureTimeout = diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 5e65de2a32e5..2c3848b8aa25 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -1724,14 +1724,14 @@ 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) { - tSirRetStatus status; + QDF_STATUS 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 (status == eSIR_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { *pbLen = (uint8_t) len; return QDF_STATUS_SUCCESS; } @@ -1750,7 +1750,7 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, pControlList = qdf_mem_malloc(WNI_CFG_SCAN_CONTROL_LIST_LEN); if (pControlList != NULL) { - if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_str(pMac, + if (QDF_IS_STATUS_SUCCESS(wlan_cfg_get_str(pMac, WNI_CFG_SCAN_CONTROL_LIST, pControlList, &len))) { for (i = 0; i < pChannelList->numChannels; i++) { diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c index 5e2a8923382e..dd5b79a96ecb 100644 --- a/core/sme/src/csr/csr_roam_preauth.c +++ b/core/sme/src/csr/csr_roam_preauth.c @@ -216,7 +216,7 @@ void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal mac_ctx, * csr_neighbor_roam_preauth_rsp_handler() - handle preauth response * @mac_ctx: The handle returned by mac_open. * @session_id: SME session - * @lim_status: eSIR_SUCCESS/eSIR_FAILURE/eSIR_LIM_MAX_STA_REACHED_ERROR/ + * @lim_status: QDF_STATUS_SUCCESS/QDF_STATUS_E_FAILURE/QDF_STATUS_E_NOSPC/ * eSIT_LIM_AUTH_RSP_TIMEOUT status from PE * * This function handle the Preauth response from PE @@ -231,7 +231,7 @@ void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal mac_ctx, */ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, uint8_t session_id, - tSirRetStatus lim_status) + QDF_STATUS lim_status) { tpCsrNeighborRoamControlInfo neighbor_roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; @@ -263,12 +263,12 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, neighbor_roam_info->FTRoamInfo.preauthRspPending = false; - if (eSIR_SUCCESS == lim_status) + if (QDF_STATUS_SUCCESS == lim_status) preauth_rsp_node = csr_neighbor_roam_next_roamable_ap( mac_ctx, &neighbor_roam_info->roamableAPList, NULL); - if ((eSIR_SUCCESS == lim_status) && (NULL != preauth_rsp_node)) { + if ((QDF_STATUS_SUCCESS == lim_status) && (NULL != preauth_rsp_node)) { sme_debug("Preauth completed successfully after %d tries", neighbor_roam_info->FTRoamInfo.numPreAuthRetries); sme_debug("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d", @@ -315,7 +315,7 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, */ if ((neighbor_roam_info->FTRoamInfo.numPreAuthRetries >= CSR_NEIGHBOR_ROAM_MAX_NUM_PREAUTH_RETRIES) || - (eSIR_LIM_MAX_STA_REACHED_ERROR == lim_status)) { + (QDF_STATUS_E_NOSPC == lim_status)) { /* * We are going to remove the node as it fails for * more than MAX tries. Reset this count to 0 diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 452290bc9ad3..a4771fc872f4 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -3018,7 +3018,7 @@ sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionId, pAddtsRsp->messageType = eWNI_SME_ADDTS_RSP; pAddtsRsp->length = sizeof(tSirAddtsRsp); - pAddtsRsp->rc = eSIR_SUCCESS; + pAddtsRsp->rc = QDF_STATUS_SUCCESS; pAddtsRsp->sessionId = sessionId; pAddtsRsp->rsp.dialogToken = 0; pAddtsRsp->rsp.status = eSIR_MAC_SUCCESS_STATUS; diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index e1733c75db09..84c8b650510c 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -270,7 +270,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( uint8_t msrmnt_status, uint8_t bss_count) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - tSirRetStatus fill_ie_status; + QDF_STATUS fill_ie_status; tpSirBssDescription bss_desc = NULL; uint32_t ie_len = 0; uint32_t out_ie_len = 0; @@ -348,7 +348,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( &(bcn_report->bcnRepBssInfo[j]. pBuf), &out_ie_len); - if (eSIR_FAILURE == fill_ie_status) + if (QDF_STATUS_E_FAILURE == fill_ie_status) continue; bcn_report->bcnRepBssInfo[j].ieLen = out_ie_len;