From cb58bbc7b6ca4edfcf039d0c1572965cb3bffc89 Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Thu, 23 May 2019 15:34:51 +0530 Subject: [PATCH] qcacld-3.0: Replace typedef tSirMacStatusCodes The Linux Coding Style enumerates a few special cases where typedefs are useful, but stresses "NEVER EVER use a typedef unless you can clearly match one of those rules." The tSirMacStatusCodes typedef does not meet any of those criteria, so replace it properly named enum. Change-Id: I4712acc4898a60ce78e7a6e71d2e91f5b1929c97 CRs-Fixed: 2459765 --- core/mac/inc/sir_api.h | 4 +- core/mac/inc/sir_mac_prot_def.h | 5 +- core/mac/src/pe/lim/lim_assoc_utils.c | 2 +- core/mac/src/pe/lim/lim_assoc_utils.h | 2 +- .../src/pe/lim/lim_process_assoc_req_frame.c | 51 ++++++++++--------- .../src/pe/lim/lim_process_sme_req_messages.c | 2 +- .../src/pe/lim/lim_send_sme_rsp_messages.c | 2 +- .../src/sys/legacy/src/utils/src/parser_api.c | 4 +- core/sme/src/csr/csr_api_roam.c | 6 +-- core/sme/src/csr/csr_inside_api.h | 2 +- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 8ad81d99552ae..a025751ec3eb4 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1136,7 +1136,7 @@ struct assoc_cnf { struct qdf_mac_addr bssid; /* Self BSSID */ struct qdf_mac_addr peer_macaddr; uint16_t aid; - tSirMacStatusCodes mac_status_code; + enum mac_status_code mac_status_code; uint8_t *owe_ie; uint32_t owe_ie_len; }; @@ -1568,7 +1568,7 @@ typedef struct sSirAddtsReqInfo { typedef struct sSirAddtsRspInfo { uint8_t dialogToken; - tSirMacStatusCodes status; + enum mac_status_code status; tSirMacTsDelayIE delay; struct mac_tspec_ie tspec; diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 49a5ddb8b8613..3feb7a37ebe2d 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -379,7 +379,7 @@ /* Status Code (present in Management response frames) enum */ /* (IEEE Std 802.11-2016, 9.4.1.9, Table 9-46) */ -typedef enum eSirMacStatusCodes { +enum mac_status_code { eSIR_MAC_SUCCESS_STATUS = 0, /* Reserved */ eSIR_MAC_UNSPEC_FAILURE_STATUS = 1, /* Unspecified reason */ /* 802.11 reserved 2-9 */ @@ -466,8 +466,7 @@ typedef enum eSirMacStatusCodes { eSIR_MAC_ESE_INVALID_PARAMETERS_STATUS = 203, /* ESE-Invalid parameters. (Re)Assoc request had one or more TSPEC parameters with */ /* invalid values. */ #endif - -} tSirMacStatusCodes; +}; /** * Reason Code (present in Deauthentication/Disassociation diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 8e1bdcaa5c8cc..b0b5ecf1ff60c 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -888,7 +888,7 @@ void lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr, uint8_t sub_type, uint8_t add_pre_auth_context, tAniAuthType auth_type, uint16_t sta_id, - uint8_t delete_sta, enum eSirMacStatusCodes result_code, + uint8_t delete_sta, enum mac_status_code result_code, struct pe_session *session_entry) { tpDphHashNode sta_ds; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index cf6fa6590f210..e269417c55ee1 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -54,7 +54,7 @@ QDF_STATUS lim_cleanup_rx_path(struct mac_context *, tpDphHashNode, struct pe_session *); void lim_reject_association(struct mac_context *, tSirMacAddr, uint8_t, uint8_t, tAniAuthType, uint16_t, uint8_t, - enum eSirMacStatusCodes, struct pe_session *); + enum mac_status_code, struct pe_session *); QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, struct supported_rates *pRates, diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 83ae5edf4c31b..dd4416cb8e540 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -823,11 +823,12 @@ static void lim_print_ht_cap(struct mac_context *mac_ctx, struct pe_session *ses } #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT -static tSirMacStatusCodes lim_check_rsn_ie(struct pe_session *session, - struct mac_context *mac_ctx, - tpSirAssocReq assoc_req, - tDot11fIERSN *rsn, - bool *pmf_connection) +static +enum mac_status_code lim_check_rsn_ie(struct pe_session *session, + struct mac_context *mac_ctx, + tpSirAssocReq assoc_req, + tDot11fIERSN *rsn, + bool *pmf_connection) { struct wlan_objmgr_vdev *vdev; @@ -863,10 +864,10 @@ static tSirMacStatusCodes lim_check_rsn_ie(struct pe_session *session, return eSIR_MAC_SUCCESS_STATUS; } -static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session, - struct mac_context *mac_ctx, - tpSirAssocReq assoc_req, - tDot11fIEWPA *wpa) +static enum mac_status_code lim_check_wpa_ie(struct pe_session *session, + struct mac_context *mac_ctx, + tpSirAssocReq assoc_req, + tDot11fIEWPA *wpa) { uint8_t buffer[WLAN_MAX_IE_LEN]; uint32_t dot11f_status, written = 0, nbuffer = WLAN_MAX_IE_LEN; @@ -888,21 +889,21 @@ static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session, return eSIR_MAC_INVALID_IE_STATUS; } #else -static tSirMacStatusCodes lim_check_rsn_ie(struct pe_session *session, - struct mac_context *mac_ctx, - tpSirAssocReq assoc_req, - tDot11fIERSN *rsn, - bool *pmf_connection) +static enum mac_status_code lim_check_rsn_ie(struct pe_session *session, + struct mac_context *mac_ctx, + tpSirAssocReq assoc_req, + tDot11fIERSN *rsn, + bool *pmf_connection) { return lim_check_rx_rsn_ie_match(mac_ctx, rsn, session, assoc_req->HTCaps.present, pmf_connection); } -static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session, - struct mac_context *mac_ctx, - tpSirAssocReq assoc_req, - tDot11fIEWPA *wpa) +static enum mac_status_code lim_check_wpa_ie(struct pe_session *session, + struct mac_context *mac_ctx, + tpSirAssocReq assoc_req, + tDot11fIEWPA *wpa) { return lim_check_rx_wpa_ie_match(mac_ctx, wpa, session, assoc_req->HTCaps.present); @@ -918,13 +919,13 @@ static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session, * capable. Reject with eSIR_MAC_ROBUST_MGMT_FRAMES_POLICY_VIOLATION * if SAE STA is pmf disable. * - * Return: tSirMacStatusCodes + * Return: mac_status_code */ #ifdef WLAN_FEATURE_SAE -static tSirMacStatusCodes lim_check_sae_pmf_cap(struct pe_session *session, - tDot11fIERSN *rsn) +static enum mac_status_code lim_check_sae_pmf_cap(struct pe_session *session, + tDot11fIERSN *rsn) { - tSirMacStatusCodes status = eSIR_MAC_SUCCESS_STATUS; + enum mac_status_code status = eSIR_MAC_SUCCESS_STATUS; if (session->pLimStartBssReq->pmfCapable && (rsn->RSN_Cap[0] & WLAN_CRYPTO_RSN_CAP_MFP_ENABLED) == 0) @@ -933,8 +934,8 @@ static tSirMacStatusCodes lim_check_sae_pmf_cap(struct pe_session *session, return status; } #else -static tSirMacStatusCodes lim_check_sae_pmf_cap(struct pe_session *session, - tDot11fIERSN *rsn) +static enum mac_status_code lim_check_sae_pmf_cap(struct pe_session *session, + tDot11fIERSN *rsn) { return eSIR_MAC_SUCCESS_STATUS; } @@ -964,7 +965,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session, uint32_t ret; tDot11fIEWPA dot11f_ie_wpa = {0}; tDot11fIERSN dot11f_ie_rsn = {0}; - tSirMacStatusCodes status = eSIR_MAC_SUCCESS_STATUS; + enum mac_status_code status = eSIR_MAC_SUCCESS_STATUS; /* * Clear the buffers so that frame parser knows that there isn't a 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 50b30fd2e5f6d..1d163cbc538c9 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 @@ -3113,7 +3113,7 @@ void __lim_process_sme_assoc_cnf_new(struct mac_context *mac_ctx, uint32_t msg_t * denied STA we need to remove this HAL entry. * So to do that set updateContext to 1 */ - tSirMacStatusCodes mac_status_code = + enum mac_status_code mac_status_code = eSIR_MAC_UNSPEC_FAILURE_STATUS; if (!sta_ds->mlmStaContext.updateContext) diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index ec358b49f44cf..c110918919190 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -1242,7 +1242,7 @@ void lim_send_sme_addts_rsp(struct mac_context *mac, rsp->messageType = eWNI_SME_ADDTS_RSP; rsp->rc = status; - rsp->rsp.status = (enum eSirMacStatusCodes)status; + rsp->rsp.status = (enum mac_status_code)status; rsp->rsp.tspec = tspec; rsp->sessionId = smesessionId; diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 52d3a7957b483..200c17ae61c42 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -4502,7 +4502,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac, /* 'tDot11WMMAddTSResponse' to a 'tSirMacAddtsRspInfo'... */ if (ACTION_CATEGORY_QOS == *pFrame) { pAddTs->dialogToken = addts.DialogToken.token; - pAddTs->status = (tSirMacStatusCodes) addts.Status.status; + pAddTs->status = (enum mac_status_code)addts.Status.status; if (addts.TSDelay.present) { convert_ts_delay(mac, &pAddTs->delay, &addts.TSDelay); @@ -4591,7 +4591,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac, } else { pAddTs->dialogToken = wmmaddts.DialogToken.token; pAddTs->status = - (tSirMacStatusCodes) wmmaddts.StatusCode.statusCode; + (enum mac_status_code)wmmaddts.StatusCode.statusCode; if (wmmaddts.WMMTSPEC.present) { pAddTs->wmeTspecPresent = 1; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index ff24e4078c258..fa8e290a7fe12 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -11211,7 +11211,7 @@ static bool csr_is_sae_peer_allowed(struct mac_context *mac_ctx, struct csr_roam_session *session, tSirMacAddr peer_mac_addr, tDot11fIERSN *rsn_ie, - tSirMacStatusCodes *mac_status_code) + enum mac_status_code *mac_status_code) { bool is_allowed = false; @@ -11318,7 +11318,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) QDF_STATUS status; struct csr_roam_info *roam_info; struct assoc_ind *pAssocInd; - tSirMacStatusCodes mac_status_code = eSIR_MAC_SUCCESS_STATUS; + enum mac_status_code mac_status_code = eSIR_MAC_SUCCESS_STATUS; eCsrAuthType csr_akm_type; sme_debug("Receive WNI_SME_ASSOC_IND from SME"); @@ -16445,7 +16445,7 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(struct mac_context *mac, QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac, struct assoc_ind *pAssocInd, QDF_STATUS Halstatus, - tSirMacStatusCodes mac_status_code) + enum mac_status_code mac_status_code) { QDF_STATUS status = QDF_STATUS_SUCCESS; struct assoc_cnf *pMsg; diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 1e3fd8e7a5dbd..f330aecaedbc3 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -287,7 +287,7 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(struct mac_context *mac, QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac, struct assoc_ind *pAssocInd, QDF_STATUS status, - tSirMacStatusCodes mac_status_code); + enum mac_status_code mac_status_code); QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t sessionId, eCsrRoamBssType bssType,