qcacld-3.0: sys: Replace tSirRetStatus with QDF_STATUS

The tSirRetStatus definitions are obsolete, so replace them with QDF_STATUS definitions in the mac sys folder. Change-Id: Ia1d4a570b7c79ea2bd0ad5f82d287c48f73051b9 CRs-Fixed: 2266497
2018-06-07 23:04:15 -07:00
parent c00e9f9eb6
commit d3c51e9d2d
10 changed files with 453 additions and 452 deletions
--- a/core/mac/src/include/parser_api.h
+++ b/core/mac/src/include/parser_api.h
@@ -541,7 +541,7 @@ uint8_t sirIsPropCapabilityEnabled(struct sAniSirGlobal *pMac, uint32_t bitnum);

 #define CFG_GET_INT(nStatus, pMac, nItem, cfg)  do { \
 		(nStatus) = wlan_cfg_get_int((pMac), (nItem), &(cfg)); \
-		if (eSIR_SUCCESS != (nStatus)) { \
+		if (QDF_STATUS_SUCCESS != (nStatus)) { \
 			pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \
 			return nStatus; \
 		} \
@@ -549,7 +549,7 @@ uint8_t sirIsPropCapabilityEnabled(struct sAniSirGlobal *pMac, uint32_t bitnum);

 #define CFG_GET_INT_NO_STATUS(nStatus, pMac, nItem, cfg) do { \
 		(nStatus) = wlan_cfg_get_int((pMac), (nItem), &(cfg)); \
-		if (eSIR_SUCCESS != (nStatus)) { \
+		if (QDF_STATUS_SUCCESS != (nStatus)) { \
 			pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \
 			return; \
 		} \
@@ -558,7 +558,7 @@ uint8_t sirIsPropCapabilityEnabled(struct sAniSirGlobal *pMac, uint32_t bitnum);
 #define CFG_GET_STR(nStatus, pMac, nItem, cfg, nCfg, nMaxCfg) do { \
 		(nCfg) = (nMaxCfg); \
 		(nStatus) = wlan_cfg_get_str((pMac), (nItem), (cfg), &(nCfg)); \
-		if (eSIR_SUCCESS != (nStatus)) { \
+		if (QDF_STATUS_SUCCESS != (nStatus)) { \
 			pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \
 			return nStatus; \
 		} \
@@ -567,7 +567,7 @@ uint8_t sirIsPropCapabilityEnabled(struct sAniSirGlobal *pMac, uint32_t bitnum);
 #define CFG_GET_STR_NO_STATUS(nStatus, pMac, nItem, cfg, nCfg, nMaxCfg) do { \
 		(nCfg) = (nMaxCfg); \
 		(nStatus) = wlan_cfg_get_str((pMac), (nItem), (cfg), &(nCfg)); \
-		if (eSIR_SUCCESS != (nStatus)) { \
+		if (QDF_STATUS_SUCCESS != (nStatus)) { \
 			pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \
 			return; \
 		} \
@@ -578,71 +578,71 @@ void swap_bit_field16(uint16_t in, uint16_t *out);
 /* Currently implemented as "shims" between callers & the new framesc- */
 /* generated code: */

-tSirRetStatus
+QDF_STATUS
 sir_convert_probe_req_frame2_struct(struct sAniSirGlobal *pMac,
 				uint8_t *frame, uint32_t len,
 				tpSirProbeReq probe);

-tSirRetStatus
+QDF_STATUS
 sir_convert_probe_frame2_struct(struct sAniSirGlobal *pMac, uint8_t *frame,
 				uint32_t len, tpSirProbeRespBeacon probe);

-tSirRetStatus
+QDF_STATUS
 sir_convert_assoc_req_frame2_struct(struct sAniSirGlobal *pMac,
 				uint8_t *frame, uint32_t len,
 				tpSirAssocReq assoc);

-tSirRetStatus
+QDF_STATUS
 sir_convert_assoc_resp_frame2_struct(struct sAniSirGlobal *pMac,
 				tpPESession session_entry,
 				uint8_t *frame, uint32_t len,
 				tpSirAssocRsp assoc);

-tSirRetStatus
+QDF_STATUS
 sir_convert_reassoc_req_frame2_struct(struct sAniSirGlobal *pMac,
 				uint8_t *frame, uint32_t len,
 				tpSirAssocReq assoc);

-tSirRetStatus
+QDF_STATUS
 sir_parse_beacon_ie(struct sAniSirGlobal *pMac,
 		tpSirProbeRespBeacon pBeaconStruct,
 		uint8_t *pPayload, uint32_t payloadLength);

-tSirRetStatus
+QDF_STATUS
 sir_convert_beacon_frame2_struct(struct sAniSirGlobal *pMac,
 				uint8_t *pBeaconFrame,
 				tpSirProbeRespBeacon pBeaconStruct);

-tSirRetStatus
+QDF_STATUS
 sir_convert_auth_frame2_struct(struct sAniSirGlobal *pMac,
 			uint8_t *frame, uint32_t len,
 			tpSirMacAuthFrameBody auth);

-tSirRetStatus
+QDF_STATUS
 sir_convert_addts_req2_struct(struct sAniSirGlobal *pMac,
 			uint8_t *frame, uint32_t len,
 			tSirAddtsReqInfo *addTs);

-tSirRetStatus
+QDF_STATUS
 sir_convert_addts_rsp2_struct(struct sAniSirGlobal *pMac,
 			uint8_t *frame, uint32_t len,
 			tSirAddtsRspInfo *addts);

-tSirRetStatus
+QDF_STATUS
 sir_convert_delts_req2_struct(struct sAniSirGlobal *pMac,
 			uint8_t *frame, uint32_t len,
 			tSirDeltsReqInfo *delTs);
-tSirRetStatus
+QDF_STATUS
 sir_convert_qos_map_configure_frame2_struct(tpAniSirGlobal pMac,
 					uint8_t *pFrame, uint32_t nFrame,
 					tSirQosMapSet *pQosMapSet);

 #ifdef ANI_SUPPORT_11H
-tSirRetStatus
+QDF_STATUS
 sir_convert_tpc_req_frame2_struct(struct sAniSirGlobal *, uint8_t *,
 				tpSirMacTpcReqActionFrame, uint32_t);

-tSirRetStatus
+QDF_STATUS
 sir_convert_meas_req_frame2_struct(struct sAniSirGlobal *, uint8_t *,
 				tpSirMacMeasReqActionFrame, uint32_t);
 #endif
@@ -664,7 +664,7 @@ sir_convert_meas_req_frame2_struct(struct sAniSirGlobal *, uint8_t *,
 *
 */

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_capabilities(tpAniSirGlobal pMac,
 			tDot11fFfCapabilities *pDot11f,
 			tpPESession psessionEntry);
@@ -690,7 +690,7 @@ populate_dot11f_capabilities(tpAniSirGlobal pMac,

 struct sDphHashNode;

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_capabilities2(tpAniSirGlobal pMac,
 			tDot11fFfCapabilities *pDot11f,
 			struct sDphHashNode *pSta,
@@ -714,12 +714,12 @@ populate_dot11f_chan_switch_wrapper(tpAniSirGlobal pMac,
 				tpPESession psessionEntry);

 /* / Populate a tDot11fIECountry */
-tSirRetStatus
+QDF_STATUS
 populate_dot11f_country(tpAniSirGlobal pMac,
 			tDot11fIECountry *pDot11f, tpPESession psessionEntry);

 /* Populated a populate_dot11f_ds_params */
-tSirRetStatus
+QDF_STATUS
 populate_dot11f_ds_params(tpAniSirGlobal pMac,
 			tDot11fIEDSParams *pDot11f, uint8_t channel);

@@ -729,11 +729,11 @@ populate_dot11f_edca_param_set(tpAniSirGlobal pMac,
 			tDot11fIEEDCAParamSet *pDot11f,
 			tpPESession psessionEntry);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_erp_info(tpAniSirGlobal pMac,
 			tDot11fIEERPInfo *pDot11f, tpPESession psessionEntry);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_ext_supp_rates(tpAniSirGlobal pMac,
 			uint8_t nChannelNum, tDot11fIEExtSuppRates *pDot11f,
 			tpPESession psessionEntry);
@@ -747,7 +747,7 @@ populate_dot11f_ext_supp_rates(tpAniSirGlobal pMac,
 *
 * Return: Ret Status
 */
-tSirRetStatus
+QDF_STATUS
 populate_dot11f_beacon_report(tpAniSirGlobal pMac,
 			tDot11fIEMeasurementReport *pDot11f,
 			tSirMacBeaconReport *pBeaconReport,
@@ -770,16 +770,16 @@ populate_dot11f_beacon_report(tpAniSirGlobal pMac,
 *
 */

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_ext_supp_rates1(tpAniSirGlobal pMac,
 				uint8_t nChannelNum,
 				tDot11fIEExtSuppRates *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_ht_caps(tpAniSirGlobal pMac,
 			tpPESession psessionEntry, tDot11fIEHTCaps *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_ht_info(tpAniSirGlobal pMac,
 			tDot11fIEHTInfo *pDot11f, tpPESession psessionEntry);

@@ -788,19 +788,19 @@ void populate_dot11f_ibss_params(tpAniSirGlobal pMac,
 				tpPESession psessionEntry);

 #ifdef ANI_SUPPORT_11H
-tSirRetStatus
+QDF_STATUS
 populate_dot11f_measurement_report0(tpAniSirGlobal pMac,
 				tpSirMacMeasReqActionFrame pReq,
 				tDot11fIEMeasurementReport *pDot11f);

 /* / Populate a tDot11fIEMeasurementReport when the report type is CCA */
-tSirRetStatus
+QDF_STATUS
 populate_dot11f_measurement_report1(tpAniSirGlobal pMac,
 				tpSirMacMeasReqActionFrame pReq,
 				tDot11fIEMeasurementReport *pDot11f);

 /* / Populate a tDot11fIEMeasurementReport when the report type is RPI Hist */
-tSirRetStatus
+QDF_STATUS
 populate_dot11f_measurement_report2(tpAniSirGlobal pMac,
 				tpSirMacMeasReqActionFrame pReq,
 				tDot11fIEMeasurementReport *pDot11f);
@@ -813,7 +813,7 @@ populate_dot11f_power_caps(tpAniSirGlobal pMac,
 			uint8_t nAssocType, tpPESession psessionEntry);

 /* / Populate a tDot11fIEPowerConstraints */
-tSirRetStatus
+QDF_STATUS
 populate_dot11f_power_constraints(tpAniSirGlobal pMac,
 				tDot11fIEPowerConstraints *pDot11f);

@@ -826,21 +826,21 @@ void
 populate_dot11f_qos_caps_station(tpAniSirGlobal pMac, tpPESession session,
 				tDot11fIEQOSCapsStation *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_rsn(tpAniSirGlobal pMac,
 		tpSirRSNie pRsnIe, tDot11fIERSN *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_rsn_opaque(tpAniSirGlobal pMac,
 		tpSirRSNie pRsnIe, tDot11fIERSNOpaque *pDot11f);

 #if defined(FEATURE_WLAN_WAPI)

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_wapi(tpAniSirGlobal pMac,
 		tpSirRSNie pRsnIe, tDot11fIEWAPI *pDot11f);

-tSirRetStatus populate_dot11f_wapi_opaque(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_wapi_opaque(tpAniSirGlobal pMac,
 					tpSirRSNie pRsnIe,
 					tDot11fIEWAPIOpaque *pDot11f);

@@ -852,7 +852,7 @@ populate_dot11f_ssid(tpAniSirGlobal pMac,
 		tSirMacSSid *pInternal, tDot11fIESSID *pDot11f);

 /* / Populate a tDot11fIESSID from CFG */
-tSirRetStatus populate_dot11f_ssid2(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_ssid2(tpAniSirGlobal pMac,
 				tDot11fIESSID *pDot11f);

 /**
@@ -900,18 +900,18 @@ populate_dot11f_supp_channels(tpAniSirGlobal pMac,

 #define POPULATE_DOT11F_RATES_OPERATIONAL (0xff)

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_supp_rates(tpAniSirGlobal pMac,
 			uint8_t nChannelNum,
 			tDot11fIESuppRates *pDot11f, tpPESession);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_rates_tdls(tpAniSirGlobal p_mac,
 			tDot11fIESuppRates *p_supp_rates,
 			tDot11fIEExtSuppRates *p_ext_supp_rates,
 			uint8_t curr_oper_channel);

-tSirRetStatus populate_dot11f_tpc_report(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_tpc_report(tpAniSirGlobal pMac,
 					tDot11fIETPCReport *pDot11f,
 					tpPESession psessionEntry);

@@ -931,7 +931,7 @@ void populate_dot11f_ese_version(tDot11fIEESEVersion *pESEVersion);
 /* Fill the Radio Management Capability */
 void populate_dot11f_ese_rad_mgmt_cap(tDot11fIEESERadMgmtCap *pESERadMgmtCap);
 /* Fill the CCKM IE */
-tSirRetStatus populate_dot11f_ese_cckm_opaque(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_ese_cckm_opaque(tpAniSirGlobal pMac,
 					tpSirCCKMie pCCKMie,
 					tDot11fIEESECckmOpaque *pDot11f);

@@ -942,7 +942,7 @@ void populate_dot11_tsrsie(tpAniSirGlobal pMac,
 void populate_dot11f_re_assoc_tspec(tpAniSirGlobal pMac,
 				tDot11fReAssocRequest *pReassoc,
 				tpPESession psessionEntry);
-tSirRetStatus
+QDF_STATUS
 sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac,
 		uint8_t *pPayload, const uint32_t payloadLength,
 		uint8_t **outIeBuf, uint32_t *pOutIeLen);
@@ -991,11 +991,11 @@ void
 populate_dot11f_wmm_schedule(tSirMacScheduleIE *pSchedule,
 			tDot11fIEWMMSchedule *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_wpa(tpAniSirGlobal pMac,
 		tpSirRSNie pRsnIe, tDot11fIEWPA *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_wpa_opaque(tpAniSirGlobal pMac,
 			tpSirRSNie pRsnIe, tDot11fIEWPAOpaque *pDot11f);

@@ -1003,60 +1003,60 @@ void populate_dot11f_tspec(tSirMacTspecIE *pOld, tDot11fIETSPEC *pDot11f);

 void populate_dot11f_wmmtspec(tSirMacTspecIE *pOld, tDot11fIEWMMTSPEC *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_tclas(tpAniSirGlobal pMac,
 		tSirTclasInfo *pOld, tDot11fIETCLAS *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_wmmtclas(tpAniSirGlobal pMac,
 			tSirTclasInfo *pOld, tDot11fIEWMMTCLAS *pDot11f);

-tSirRetStatus populate_dot11f_wsc(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_wsc(tpAniSirGlobal pMac,
 			tDot11fIEWscBeacon *pDot11f);

-tSirRetStatus populate_dot11f_wsc_registrar_info(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_wsc_registrar_info(tpAniSirGlobal pMac,
 						tDot11fIEWscBeacon *pDot11f);

-tSirRetStatus de_populate_dot11f_wsc_registrar_info(tpAniSirGlobal pMac,
+QDF_STATUS de_populate_dot11f_wsc_registrar_info(tpAniSirGlobal pMac,
 						tDot11fIEWscBeacon *pDot11f);

-tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac,
 						tDot11fIEWscProbeRes *pDot11f,
 						tpPESession psessionEntry);
-tSirRetStatus populate_dot11f_assoc_res_wpsi_es(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_assoc_res_wpsi_es(tpAniSirGlobal pMac,
 						tDot11fIEWscAssocRes *pDot11f,
 						tpPESession psessionEntry);
-tSirRetStatus populate_dot11f_beacon_wpsi_es(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_beacon_wpsi_es(tpAniSirGlobal pMac,
 					tDot11fIEWscBeacon *pDot11f,
 					tpPESession psessionEntry);

-tSirRetStatus populate_dot11f_wsc_in_probe_res(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_wsc_in_probe_res(tpAniSirGlobal pMac,
 					tDot11fIEWscProbeRes *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_wsc_registrar_info_in_probe_res(tpAniSirGlobal pMac,
 					tDot11fIEWscProbeRes *pDot11f);

-tSirRetStatus
+QDF_STATUS
 de_populate_dot11f_wsc_registrar_info_in_probe_res(tpAniSirGlobal pMac,
 						tDot11fIEWscProbeRes *pDot11f);

-tSirRetStatus populate_dot11f_assoc_res_wsc_ie(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_assoc_res_wsc_ie(tpAniSirGlobal pMac,
 					tDot11fIEWscAssocRes *pDot11f,
 					tpSirAssocReq pRcvdAssocReq);

-tSirRetStatus populate_dot11_assoc_res_p2p_ie(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11_assoc_res_p2p_ie(tpAniSirGlobal pMac,
 					tDot11fIEP2PAssocRes *pDot11f,
 					tpSirAssocReq pRcvdAssocReq);

-tSirRetStatus populate_dot11f_wscInAssocRes(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_wscInAssocRes(tpAniSirGlobal pMac,
 					tDot11fIEWscAssocRes *pDot11f);

-tSirRetStatus populate_dot11f_wfatpc(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_wfatpc(tpAniSirGlobal pMac,
 				tDot11fIEWFATPC *pDot11f, uint8_t txPower,
 				uint8_t linkMargin);

-tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_rrm_ie(tpAniSirGlobal pMac,
 				tDot11fIERRMEnabledCap *pDot11f,
 				tpPESession psessionEntry);

@@ -1073,20 +1073,20 @@ int find_ie_location(tpAniSirGlobal pMac, tpSirRSNie pRsnIe, uint8_t EID);

 void lim_log_vht_cap(tpAniSirGlobal pMac, tDot11fIEVHTCaps *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_vht_caps(tpAniSirGlobal pMac, tpPESession psessionEntry,
 			tDot11fIEVHTCaps *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_vht_operation(tpAniSirGlobal pMac,
 			tpPESession psessionEntry,
 			tDot11fIEVHTOperation *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_vht_ext_bss_load(tpAniSirGlobal pMac,
 				tDot11fIEVHTExtBssLoad *pDot11f);

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_ext_cap(tpAniSirGlobal pMac, bool isVHTEnabled,
 			tDot11fIEExtCap *pDot11f, tpPESession psessionEntry);

@@ -1113,7 +1113,7 @@ static inline void populate_dot11f_fils_params(tpAniSirGlobal mac_ctx,
 { }
 #endif

-tSirRetStatus
+QDF_STATUS
 populate_dot11f_operating_mode(tpAniSirGlobal pMac,
 			tDot11fIEOperatingMode *pDot11f,
 			tpPESession psessionEntry);
@@ -1135,12 +1135,12 @@ populate_dot11f_avoid_channel_ie(tpAniSirGlobal mac_ctx,
 				tpPESession session_entry);
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */

-tSirRetStatus populate_dot11f_timing_advert_frame(tpAniSirGlobal pMac,
+QDF_STATUS populate_dot11f_timing_advert_frame(tpAniSirGlobal pMac,
 	tDot11fTimingAdvertisementFrame *frame);
 void populate_dot11_supp_operating_classes(tpAniSirGlobal mac_ptr,
 	tDot11fIESuppOperatingClasses *dot_11_ptr, tpPESession session_entry);

-tSirRetStatus
+QDF_STATUS
 sir_validate_and_rectify_ies(tpAniSirGlobal mac_ctx,
 				uint8_t *mgmt_frame,
 				uint32_t frame_bytes,
@@ -1219,16 +1219,16 @@ static inline QDF_STATUS populate_dot11f_he_bss_color_change(
 *
 * Populate the TWT extended capabilities based on the target and INI support.
 *
- * Return: tSirRetStatus Success or Failure
+ * Return: QDF_STATUS Success or Failure
 */
-tSirRetStatus populate_dot11f_twt_extended_caps(tpAniSirGlobal mac_ctx,
-						tpPESession pe_session,
-						tDot11fIEExtCap *dot11f);
+QDF_STATUS populate_dot11f_twt_extended_caps(tpAniSirGlobal mac_ctx,
+					     tpPESession pe_session,
+					     tDot11fIEExtCap *dot11f);
 #else
-static inline tSirRetStatus
-populate_dot11f_twt_extended_caps(tpAniSirGlobal mac_ctx,
-				  tpPESession pe_session,
-				  tDot11fIEExtCap *dot11f)
+static inline
+QDF_STATUS populate_dot11f_twt_extended_caps(tpAniSirGlobal mac_ctx,
+					     tpPESession pe_session,
+					     tDot11fIEExtCap *dot11f)
 {
 	return QDF_STATUS_SUCCESS;
 }
--- a/core/mac/src/include/utils_api.h
+++ b/core/mac/src/include/utils_api.h
@@ -37,8 +37,8 @@ typedef enum eBssSystemRole {
 	eSYSTEM_MULTI_BSS_ROLE = eSYSTEM_LAST_ROLE
 } tBssSystemRole;

-extern tSirRetStatus cfg_init(tpAniSirGlobal);
-extern void cfg_de_init(tpAniSirGlobal);
+QDF_STATUS cfg_init(tpAniSirGlobal);
+void cfg_de_init(tpAniSirGlobal);

 /**
 * sir_swap_u16()
--- a/core/mac/src/sys/common/src/wlan_qct_sys.c
+++ b/core/mac/src/sys/common/src/wlan_qct_sys.c
@@ -18,7 +18,7 @@

 #include <wlan_qct_sys.h>
 #include <cds_api.h>
-#include <sir_types.h>           /* needed for tSirRetStatus */
+#include <sir_types.h>
 #include <sir_params.h>          /* needed for tSirMbMsg */
 #include <sir_api.h>             /* needed for SIR_... message types */
 #include <wni_api.h>             /* needed for WNI_... message types */
--- a/core/mac/src/sys/legacy/src/system/inc/sys_entry_func.h
+++ b/core/mac/src/sys/legacy/src/system/inc/sys_entry_func.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012, 2014, 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012, 2014, 2017-2018 The Linux Foundation. All rights reserved.
 *
 * Permission to use, copy, modify, and/or distribute this software for
 * any purpose with or without fee is hereby granted, provided that the
@@ -30,7 +30,7 @@

 #include "ani_global.h"

-extern tSirRetStatus sys_init_globals(tpAniSirGlobal);
+extern QDF_STATUS sys_init_globals(tpAniSirGlobal);
 extern void sysBbtEntry(uint32_t dummy);
 extern void sysSchEntry(uint32_t dummy);
 extern void sysPmmEntry(uint32_t dummy);
--- a/core/mac/src/sys/legacy/src/system/inc/sys_startup.h
+++ b/core/mac/src/sys/legacy/src/system/inc/sys_startup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014, 2017-2018 The Linux Foundation. All rights reserved.
 *
 * Permission to use, copy, modify, and/or distribute this software for
 * any purpose with or without fee is hereby granted, provided that the
@@ -37,9 +37,9 @@

 /* Function */

-extern void sysMACCleanup(void *);
-extern tSirRetStatus sys_bbt_process_message_core(struct sAniSirGlobal *,
-						  struct scheduler_msg *,
-						  uint32_t, uint32_t);
+void sysMACCleanup(void *);
+QDF_STATUS sys_bbt_process_message_core(struct sAniSirGlobal *,
+					struct scheduler_msg *,
+					uint32_t, uint32_t);

 #endif /* __SYSSTARTUP_H */
--- 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
@@ -41,17 +41,14 @@

 static tAniSirGlobal global_mac_context;

-extern tSirRetStatus halDoCfgInit(tpAniSirGlobal pMac);
-extern tSirRetStatus halProcessStartEvent(tpAniSirGlobal pMac);
-
-tSirRetStatus mac_start(tHalHandle hHal, void *pHalMacStartParams)
+QDF_STATUS mac_start(tHalHandle hHal, void *pHalMacStartParams)
 {
-	tSirRetStatus status = eSIR_SUCCESS;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = (tpAniSirGlobal) hHal;

 	if (NULL == pMac) {
 		QDF_ASSERT(0);
-		status = eSIR_FAILURE;
+		status = QDF_STATUS_E_FAILURE;
 		return status;
 	}

@@ -71,7 +68,7 @@ tSirRetStatus mac_start(tHalHandle hHal, void *pHalMacStartParams)
 \       memory with global context will only be initialized not freed here.
   \param   tHalHandle hHal
   \param tHalStopType
-   \return tSirRetStatus
+   \return QDF_STATUS
   -------------------------------------------------------------*/

 QDF_STATUS mac_stop(tHalHandle hHal, tHalStopType stopType)
@@ -91,18 +88,17 @@ QDF_STATUS mac_stop(tHalHandle hHal, tHalStopType stopType)
   \param   tHalHandle pHalHandle
   \param   hdd_handle_t hHdd
   \param   tHalOpenParameters* pHalOpenParams
-   \return tSirRetStatus
+   \return QDF_STATUS
   -------------------------------------------------------------*/

-tSirRetStatus mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
-			hdd_handle_t hHdd, struct cds_config_info *cds_cfg)
+QDF_STATUS mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
+		    hdd_handle_t hHdd, struct cds_config_info *cds_cfg)
 {
 	tpAniSirGlobal p_mac = &global_mac_context;
-	tSirRetStatus status = eSIR_SUCCESS;
-	QDF_STATUS qdf_status;
+	QDF_STATUS status;

 	if (pHalHandle == NULL)
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;

 	/*
 	 * Set various global fields of p_mac here
@@ -111,10 +107,10 @@ tSirRetStatus mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
 	 */
 	p_mac->hHdd = hHdd;

-	qdf_status = wlan_objmgr_psoc_try_get_ref(psoc, WLAN_LEGACY_MAC_ID);
-	if (QDF_IS_STATUS_ERROR(qdf_status)) {
+	status = wlan_objmgr_psoc_try_get_ref(psoc, WLAN_LEGACY_MAC_ID);
+	if (QDF_IS_STATUS_ERROR(status)) {
 		pe_err("PSOC get ref failure");
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}

 	p_mac->psoc = psoc;
@@ -128,8 +124,8 @@ tSirRetStatus mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
 			p_mac->gDriverType = QDF_DRIVER_TYPE_MFG;

 		/* Call routine to initialize CFG data structures */
-		if (eSIR_SUCCESS != cfg_init(p_mac))
-			return eSIR_FAILURE;
+		if (QDF_STATUS_SUCCESS != cfg_init(p_mac))
+			return QDF_STATUS_E_FAILURE;

 		sys_init_globals(p_mac);
 	}
@@ -141,7 +137,7 @@ tSirRetStatus mac_open(struct wlan_objmgr_psoc *psoc, tHalHandle *pHalHandle,
 	p_mac->is_usr_cfg_amsdu_enabled = true;

 	status =  pe_open(p_mac, cds_cfg);
-	if (eSIR_SUCCESS != status) {
+	if (QDF_STATUS_SUCCESS != status) {
 		pe_err("pe_open() failure");
 		cfg_de_init(p_mac);
 	}
--- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
+++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
@@ -41,9 +41,6 @@
 #include "sys_startup.h"
 #include "lim_trace.h"
 #include "wma_types.h"
-
-tSirRetStatus postPTTMsgApi(tpAniSirGlobal pMac, struct scheduler_msg *pMsg);
-
 #include "qdf_types.h"
 #include "cds_packet.h"

@@ -65,14 +62,14 @@ tSirRetStatus postPTTMsgApi(tpAniSirGlobal pMac, struct scheduler_msg *pMsg);
 * @return None
 */

-tSirRetStatus sys_init_globals(tpAniSirGlobal pMac)
+QDF_STATUS sys_init_globals(tpAniSirGlobal pMac)
 {

 	qdf_mem_set((uint8_t *) &pMac->sys, sizeof(pMac->sys), 0);

 	pMac->sys.gSysEnableLinkMonitorMode = 0;

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

 /**
@@ -86,12 +83,12 @@ tSirRetStatus sys_init_globals(tpAniSirGlobal pMac)
 *
 * Return: None
 */
-tSirRetStatus
+QDF_STATUS
 sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg,
 		uint32_t type, uint32_t subtype)
 {
 	uint32_t framecount;
-	tSirRetStatus ret;
+	QDF_STATUS ret;
 	void *bd_ptr;
 	tMgmtFrmDropReason dropreason;
 	cds_pkt_t *vos_pkt = (cds_pkt_t *) msg->bodyptr;
@@ -155,8 +152,8 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg,
 		}

 		/* Post the message to PE Queue */
-		ret = (tSirRetStatus) lim_post_msg_api(mac_ctx, msg);
-		if (ret != eSIR_SUCCESS) {
+		ret = (QDF_STATUS) lim_post_msg_api(mac_ctx, msg);
+		if (ret != QDF_STATUS_SUCCESS) {
 			pe_err("posting to LIM2 failed, ret %d\n", ret);
 			goto fail;
 		}
@@ -165,8 +162,8 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg,
 	} else if (type == SIR_MAC_DATA_FRAME) {
 		pe_debug("IAPP Frame...");
 		/* Post the message to PE Queue */
-		ret = (tSirRetStatus) lim_post_msg_api(mac_ctx, msg);
-		if (ret != eSIR_SUCCESS) {
+		ret = (QDF_STATUS) lim_post_msg_api(mac_ctx, msg);
+		if (ret != QDF_STATUS_SUCCESS) {
 			pe_err("posting to LIM2 failed, ret: %d", ret);
 			goto fail;
 		}
@@ -178,9 +175,9 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, struct scheduler_msg *msg,
 			lim_get_sme_state(mac_ctx));
 		goto fail;
 	}
-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 fail:
 	mac_ctx->sys.gSysBbtDropped++;
-	return eSIR_FAILURE;
+	return QDF_STATUS_E_FAILURE;
 }

--- a/core/mac/src/sys/legacy/src/utils/inc/utils_parser.h
+++ b/core/mac/src/sys/legacy/src/utils/inc/utils_parser.h
@@ -45,14 +45,14 @@ void convert_qos_caps(tpAniSirGlobal, tSirMacQosCapabilityIE *,
 		      tDot11fIEQOSCapsAp *);
 void convert_qos_caps_station(tpAniSirGlobal, tSirMacQosCapabilityStaIE *,
 			      tDot11fIEQOSCapsStation *);
-tSirRetStatus convert_wpa(tpAniSirGlobal, tSirMacWpaInfo *, tDot11fIEWPA *);
-tSirRetStatus convert_wpa_opaque(tpAniSirGlobal, tSirMacWpaInfo *,
-				 tDot11fIEWPAOpaque *);
-tSirRetStatus convert_wapi_opaque(tpAniSirGlobal, tSirMacWapiInfo *,
-				  tDot11fIEWAPIOpaque *);
-tSirRetStatus convert_rsn(tpAniSirGlobal, tSirMacRsnInfo *, tDot11fIERSN *);
-tSirRetStatus convert_rsn_opaque(tpAniSirGlobal, tSirMacRsnInfo *,
-				 tDot11fIERSNOpaque *);
+QDF_STATUS convert_wpa(tpAniSirGlobal, tSirMacWpaInfo *, tDot11fIEWPA *);
+QDF_STATUS convert_wpa_opaque(tpAniSirGlobal, tSirMacWpaInfo *,
+			      tDot11fIEWPAOpaque *);
+QDF_STATUS convert_wapi_opaque(tpAniSirGlobal, tSirMacWapiInfo *,
+			       tDot11fIEWAPIOpaque *);
+QDF_STATUS convert_rsn(tpAniSirGlobal, tSirMacRsnInfo *, tDot11fIERSN *);
+QDF_STATUS convert_rsn_opaque(tpAniSirGlobal, tSirMacRsnInfo *,
+			      tDot11fIERSNOpaque *);
 void convert_power_caps(tpAniSirGlobal, tSirMacPowerCapabilityIE *,
 			tDot11fIEPowerCaps *);
 void convert_supp_channels(tpAniSirGlobal, tSirMacSupportedChannelIE *,
@@ -70,21 +70,21 @@ void convert_mu_edca_param(tpAniSirGlobal mac_ctx,
 			tSirMacEdcaParamSetIE *mu_edca,
 			tDot11fIEmu_edca_param_set *ie);
 void convert_tspec(tpAniSirGlobal, tSirMacTspecIE *, tDot11fIETSPEC *);
-tSirRetStatus convert_tclas(tpAniSirGlobal, tSirTclasInfo *, tDot11fIETCLAS *);
+QDF_STATUS convert_tclas(tpAniSirGlobal, tSirTclasInfo *, tDot11fIETCLAS *);
 void convert_wmmtspec(tpAniSirGlobal, tSirMacTspecIE *, tDot11fIEWMMTSPEC *);
-tSirRetStatus convert_wmmtclas(tpAniSirGlobal, tSirTclasInfo *,
-			       tDot11fIEWMMTCLAS *);
+QDF_STATUS convert_wmmtclas(tpAniSirGlobal, tSirTclasInfo *,
+			    tDot11fIEWMMTCLAS *);
 void convert_ts_delay(tpAniSirGlobal, tSirMacTsDelayIE *, tDot11fIETSDelay *);
 void convert_schedule(tpAniSirGlobal, tSirMacScheduleIE *, tDot11fIESchedule *);
 void convert_wmm_schedule(tpAniSirGlobal, tSirMacScheduleIE *,
 			  tDot11fIEWMMSchedule *);
-tSirRetStatus convert_wsc_opaque(tpAniSirGlobal, tSirAddie *,
-				 tDot11fIEWscIEOpaque *);
-tSirRetStatus convert_p2p_opaque(tpAniSirGlobal, tSirAddie *,
-				  tDot11fIEP2PIEOpaque *);
+QDF_STATUS convert_wsc_opaque(tpAniSirGlobal, tSirAddie *,
+			      tDot11fIEWscIEOpaque *);
+QDF_STATUS convert_p2p_opaque(tpAniSirGlobal, tSirAddie *,
+			      tDot11fIEP2PIEOpaque *);
 #ifdef WLAN_FEATURE_WFD
-tSirRetStatus convert_wfd_opaque(tpAniSirGlobal, tSirAddie *,
-				 tDot11fIEWFDIEOpaque *);
+QDF_STATUS convert_wfd_opaque(tpAniSirGlobal, tSirAddie *,
+			      tDot11fIEWFDIEOpaque *);
 #endif
 void convert_qos_mapset_frame(tpAniSirGlobal, tSirQosMapSet *,
 			      tDot11fIEQosMapSet *);
--- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c
--- a/core/mac/src/sys/legacy/src/utils/src/utils_parser.c
+++ b/core/mac/src/sys/legacy/src/utils/src/utils_parser.c
@@ -77,8 +77,8 @@ void convert_qos_caps_station(tpAniSirGlobal pMac,
 	pOld->qosInfo.acvo_uapsd = pNew->acvo_uapsd;
 }

-tSirRetStatus convert_wpa(tpAniSirGlobal pMac,
-			  tSirMacWpaInfo *pOld, tDot11fIEWPA *pNew)
+QDF_STATUS convert_wpa(tpAniSirGlobal pMac,
+		       tSirMacWpaInfo *pOld, tDot11fIEWPA *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into an */
 	/* array... */
@@ -88,17 +88,17 @@ tSirRetStatus convert_wpa(tpAniSirGlobal pMac,
 	status = dot11f_pack_ie_wpa(pMac, pNew, buffer, nbuffer, &written);
 	if (DOT11F_FAILED(status)) {
 		pe_err("Failed to re-pack the WPA IE (0x%0x8)", status);
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}

 	pOld->length = (uint8_t) written - 2;
 	qdf_mem_copy(pOld->info, buffer + 2, pOld->length);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

-tSirRetStatus convert_wpa_opaque(tpAniSirGlobal pMac,
-				 tSirMacWpaInfo *pOld, tDot11fIEWPAOpaque *pNew)
+QDF_STATUS convert_wpa_opaque(tpAniSirGlobal pMac,
+			      tSirMacWpaInfo *pOld, tDot11fIEWPAOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
 	/* an opaque array.  Note that we need to explicitly add the OUI! */
@@ -109,25 +109,25 @@ tSirRetStatus convert_wpa_opaque(tpAniSirGlobal pMac,
 	pOld->info[3] = 0x01;
 	qdf_mem_copy(pOld->info + 4, pNew->data, pNew->num_data);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

 #ifdef FEATURE_WLAN_WAPI
-tSirRetStatus convert_wapi_opaque(tpAniSirGlobal pMac,
-				  tSirMacWapiInfo *pOld,
-				  tDot11fIEWAPIOpaque *pNew)
+QDF_STATUS convert_wapi_opaque(tpAniSirGlobal pMac,
+			       tSirMacWapiInfo *pOld,
+			       tDot11fIEWAPIOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
 	/* an opaque array.  Note that we need to explicitly add the OUI! */
 	pOld->length = pNew->num_data;
 	qdf_mem_copy(pOld->info, pNew->data, pNew->num_data);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }
 #endif

-tSirRetStatus convert_wsc_opaque(tpAniSirGlobal pMac,
-				 tSirAddie *pOld, tDot11fIEWscIEOpaque *pNew)
+QDF_STATUS convert_wsc_opaque(tpAniSirGlobal pMac,
+			      tSirAddie *pOld, tDot11fIEWscIEOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
 	/* an opaque array.  Note that we need to explicitly add the vendorIE and OUI ! */
@@ -142,11 +142,11 @@ tSirRetStatus convert_wsc_opaque(tpAniSirGlobal pMac,
 	pOld->addIEdata[curAddIELen++] = 0x04;
 	qdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

-tSirRetStatus convert_p2p_opaque(tpAniSirGlobal pMac,
-				  tSirAddie *pOld, tDot11fIEP2PIEOpaque *pNew)
+QDF_STATUS convert_p2p_opaque(tpAniSirGlobal pMac,
+			      tSirAddie *pOld, tDot11fIEP2PIEOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
 	/* an opaque array.  Note that we need to explicitly add the vendorIE and OUI ! */
@@ -161,12 +161,12 @@ tSirRetStatus convert_p2p_opaque(tpAniSirGlobal pMac,
 	pOld->addIEdata[curAddIELen++] = 0x09;
 	qdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

 #ifdef WLAN_FEATURE_WFD
-tSirRetStatus convert_wfd_opaque(tpAniSirGlobal pMac,
-				 tSirAddie *pOld, tDot11fIEWFDIEOpaque *pNew)
+QDF_STATUS convert_wfd_opaque(tpAniSirGlobal pMac,
+			      tSirAddie *pOld, tDot11fIEWFDIEOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
 	/* an opaque array.  Note that we need to explicitly add the vendorIE and OUI ! */
@@ -181,12 +181,12 @@ tSirRetStatus convert_wfd_opaque(tpAniSirGlobal pMac,
 	pOld->addIEdata[curAddIELen++] = 0x0a;
 	qdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }
 #endif

-tSirRetStatus convert_rsn(tpAniSirGlobal pMac,
-			  tSirMacRsnInfo *pOld, tDot11fIERSN *pNew)
+QDF_STATUS convert_rsn(tpAniSirGlobal pMac,
+		       tSirMacRsnInfo *pOld, tDot11fIERSN *pNew)
 {
 	uint8_t buffer[257];
 	uint32_t status, written = 0, nbuffer = 257;
@@ -194,24 +194,24 @@ tSirRetStatus convert_rsn(tpAniSirGlobal pMac,
 	status = dot11f_pack_ie_rsn(pMac, pNew, buffer, nbuffer, &written);
 	if (DOT11F_FAILED(status)) {
 		pe_err("Failed to re-pack the RSN IE (0x%0x8)", status);
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}

 	pOld->length = (uint8_t) written - 2;
 	qdf_mem_copy(pOld->info, buffer + 2, pOld->length);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

-tSirRetStatus convert_rsn_opaque(tpAniSirGlobal pMac,
-				 tSirMacRsnInfo *pOld, tDot11fIERSNOpaque *pNew)
+QDF_STATUS convert_rsn_opaque(tpAniSirGlobal pMac,
+			      tSirMacRsnInfo *pOld, tDot11fIERSNOpaque *pNew)
 {
 	/* This is awful, I know, but the old code just rammed the IE into */
 	/* an opaque array. */
 	pOld->length = pNew->num_data;
 	qdf_mem_copy(pOld->info, pNew->data, pOld->length);

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

 void convert_power_caps(tpAniSirGlobal pMac,
@@ -432,13 +432,13 @@ void convert_tspec(tpAniSirGlobal pMac,
 	pOld->mediumTime = pNew->medium_time;
 }

-tSirRetStatus convert_tclas(tpAniSirGlobal pMac,
-			    tSirTclasInfo *pOld, tDot11fIETCLAS *pNew)
+QDF_STATUS convert_tclas(tpAniSirGlobal pMac,
+			 tSirTclasInfo *pOld, tDot11fIETCLAS *pNew)
 {
 	uint32_t length = 0;

 	if (DOT11F_FAILED(dot11f_get_packed_ietclas(pMac, pNew, &length))) {
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}

 	pOld->tclas.type = DOT11F_EID_TCLAS;
@@ -494,7 +494,7 @@ tSirRetStatus convert_tclas(tpAniSirGlobal pMac,
 				     (uint8_t *) pNew->info.IpParams.params.
 				     IpV6Params.flow_label, 3);
 		} else {
-			return eSIR_FAILURE;
+			return QDF_STATUS_E_FAILURE;
 		}
 		break;
 	case 2:
@@ -502,10 +502,10 @@ tSirRetStatus convert_tclas(tpAniSirGlobal pMac,
 			pNew->info.Params8021dq.tag_type;
 		break;
 	default:
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

 void convert_wmmtspec(tpAniSirGlobal pMac,
@@ -536,13 +536,13 @@ void convert_wmmtspec(tpAniSirGlobal pMac,
 	pOld->mediumTime = pNew->medium_time;
 }

-tSirRetStatus convert_wmmtclas(tpAniSirGlobal pMac,
-			       tSirTclasInfo *pOld, tDot11fIEWMMTCLAS *pNew)
+QDF_STATUS convert_wmmtclas(tpAniSirGlobal pMac,
+			    tSirTclasInfo *pOld, tDot11fIEWMMTCLAS *pNew)
 {
 	uint32_t length = 0;

 	if (DOT11F_FAILED(dot11f_get_packed_iewmmtclas(pMac, pNew, &length))) {
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}

 	pOld->tclas.type = DOT11F_EID_WMMTCLAS;
@@ -598,7 +598,7 @@ tSirRetStatus convert_wmmtclas(tpAniSirGlobal pMac,
 				     (uint8_t *) pNew->info.IpParams.params.
 				     IpV6Params.flow_label, 3);
 		} else {
-			return eSIR_FAILURE;
+			return QDF_STATUS_E_FAILURE;
 		}
 		break;
 	case 2:
@@ -606,10 +606,10 @@ tSirRetStatus convert_wmmtclas(tpAniSirGlobal pMac,
 			pNew->info.Params8021dq.tag_type;
 		break;
 	default:
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}

-	return eSIR_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }

 void convert_ts_delay(tpAniSirGlobal pMac,