lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Replace typedef tSirMacStatusCodes

Browse Source 
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
This commit is contained in:
Pragaspathi Thilagaraj 2019-05-23 15:34:51 +05:30
parent be24d8ccb5
commit cb58bbc7b6
10 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/mac/inc/sir_api.h
View File

@ -1136,7 +1136,7 @@ struct assoc_cnf {
struct qdf_mac_addr bssid; /* Self BSSID */ struct qdf_mac_addr bssid; /* Self BSSID */
struct qdf_mac_addr peer_macaddr; struct qdf_mac_addr peer_macaddr;
uint16_t aid; uint16_t aid;
tSirMacStatusCodes mac_status_code; enum mac_status_code mac_status_code;
uint8_t *owe_ie; uint8_t *owe_ie;
uint32_t owe_ie_len; uint32_t owe_ie_len;
}; };
@ -1568,7 +1568,7 @@ typedef struct sSirAddtsReqInfo {
typedef struct sSirAddtsRspInfo { typedef struct sSirAddtsRspInfo {
uint8_t dialogToken; uint8_t dialogToken;
tSirMacStatusCodes status; enum mac_status_code status;
tSirMacTsDelayIE delay; tSirMacTsDelayIE delay;
struct mac_tspec_ie tspec; struct mac_tspec_ie tspec;

5
core/mac/inc/sir_mac_prot_def.h
View File

@ -379,7 +379,7 @@
/* Status Code (present in Management response frames) enum */ /* Status Code (present in Management response frames) enum */
/* (IEEE Std 802.11-2016, 9.4.1.9, Table 9-46) */ /* (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_SUCCESS_STATUS = 0, /* Reserved */
eSIR_MAC_UNSPEC_FAILURE_STATUS = 1, /* Unspecified reason */ eSIR_MAC_UNSPEC_FAILURE_STATUS = 1, /* Unspecified reason */
/* 802.11 reserved 2-9 */ /* 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 */ eSIR_MAC_ESE_INVALID_PARAMETERS_STATUS = 203, /* ESE-Invalid parameters. (Re)Assoc request had one or more TSPEC parameters with */
/* invalid values. */ /* invalid values. */
#endif #endif
};
} tSirMacStatusCodes;
/** /**
* Reason Code (present in Deauthentication/Disassociation * Reason Code (present in Deauthentication/Disassociation

2
core/mac/src/pe/lim/lim_assoc_utils.c
View File

@ -888,7 +888,7 @@ void
lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr, lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr,
uint8_t sub_type, uint8_t add_pre_auth_context, uint8_t sub_type, uint8_t add_pre_auth_context,
tAniAuthType auth_type, uint16_t sta_id, 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) struct pe_session *session_entry)
{ {
tpDphHashNode sta_ds; tpDphHashNode sta_ds;

2
core/mac/src/pe/lim/lim_assoc_utils.h
View File

@ -54,7 +54,7 @@ QDF_STATUS lim_cleanup_rx_path(struct mac_context *, tpDphHashNode,
struct pe_session *); struct pe_session *);
void lim_reject_association(struct mac_context *, tSirMacAddr, uint8_t, void lim_reject_association(struct mac_context *, tSirMacAddr, uint8_t,
uint8_t, tAniAuthType, uint16_t, 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, QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac,
struct supported_rates *pRates, struct supported_rates *pRates,

19
core/mac/src/pe/lim/lim_process_assoc_req_frame.c
View File

@ -823,7 +823,8 @@ static void lim_print_ht_cap(struct mac_context *mac_ctx, struct pe_session *ses
} }
#ifdef WLAN_CONV_CRYPTO_IE_SUPPORT #ifdef WLAN_CONV_CRYPTO_IE_SUPPORT
static tSirMacStatusCodes lim_check_rsn_ie(struct pe_session *session, static
enum mac_status_code lim_check_rsn_ie(struct pe_session *session,
struct mac_context *mac_ctx, struct mac_context *mac_ctx,
tpSirAssocReq assoc_req, tpSirAssocReq assoc_req,
tDot11fIERSN *rsn, tDot11fIERSN *rsn,
@ -863,7 +864,7 @@ static tSirMacStatusCodes lim_check_rsn_ie(struct pe_session *session,
return eSIR_MAC_SUCCESS_STATUS; return eSIR_MAC_SUCCESS_STATUS;
} }
static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session, static enum mac_status_code lim_check_wpa_ie(struct pe_session *session,
struct mac_context *mac_ctx, struct mac_context *mac_ctx,
tpSirAssocReq assoc_req, tpSirAssocReq assoc_req,
tDot11fIEWPA *wpa) tDot11fIEWPA *wpa)
@ -888,7 +889,7 @@ static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session,
return eSIR_MAC_INVALID_IE_STATUS; return eSIR_MAC_INVALID_IE_STATUS;
} }
#else #else
static tSirMacStatusCodes lim_check_rsn_ie(struct pe_session *session, static enum mac_status_code lim_check_rsn_ie(struct pe_session *session,
struct mac_context *mac_ctx, struct mac_context *mac_ctx,
tpSirAssocReq assoc_req, tpSirAssocReq assoc_req,
tDot11fIERSN *rsn, tDot11fIERSN *rsn,
@ -899,7 +900,7 @@ static tSirMacStatusCodes lim_check_rsn_ie(struct pe_session *session,
pmf_connection); pmf_connection);
} }
static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session, static enum mac_status_code lim_check_wpa_ie(struct pe_session *session,
struct mac_context *mac_ctx, struct mac_context *mac_ctx,
tpSirAssocReq assoc_req, tpSirAssocReq assoc_req,
tDot11fIEWPA *wpa) tDot11fIEWPA *wpa)
@ -918,13 +919,13 @@ static tSirMacStatusCodes lim_check_wpa_ie(struct pe_session *session,
* capable. Reject with eSIR_MAC_ROBUST_MGMT_FRAMES_POLICY_VIOLATION * capable. Reject with eSIR_MAC_ROBUST_MGMT_FRAMES_POLICY_VIOLATION
* if SAE STA is pmf disable. * if SAE STA is pmf disable.
* *
* Return: tSirMacStatusCodes * Return: mac_status_code
*/ */
#ifdef WLAN_FEATURE_SAE #ifdef WLAN_FEATURE_SAE
static tSirMacStatusCodes lim_check_sae_pmf_cap(struct pe_session *session, static enum mac_status_code lim_check_sae_pmf_cap(struct pe_session *session,
tDot11fIERSN *rsn) tDot11fIERSN *rsn)
{ {
tSirMacStatusCodes status = eSIR_MAC_SUCCESS_STATUS; enum mac_status_code status = eSIR_MAC_SUCCESS_STATUS;
if (session->pLimStartBssReq->pmfCapable && if (session->pLimStartBssReq->pmfCapable &&
(rsn->RSN_Cap[0] & WLAN_CRYPTO_RSN_CAP_MFP_ENABLED) == 0) (rsn->RSN_Cap[0] & WLAN_CRYPTO_RSN_CAP_MFP_ENABLED) == 0)
@ -933,7 +934,7 @@ static tSirMacStatusCodes lim_check_sae_pmf_cap(struct pe_session *session,
return status; return status;
} }
#else #else
static tSirMacStatusCodes lim_check_sae_pmf_cap(struct pe_session *session, static enum mac_status_code lim_check_sae_pmf_cap(struct pe_session *session,
tDot11fIERSN *rsn) tDot11fIERSN *rsn)
{ {
return eSIR_MAC_SUCCESS_STATUS; return eSIR_MAC_SUCCESS_STATUS;
@ -964,7 +965,7 @@ static bool lim_check_wpa_rsn_ie(struct pe_session *session,
uint32_t ret; uint32_t ret;
tDot11fIEWPA dot11f_ie_wpa = {0}; tDot11fIEWPA dot11f_ie_wpa = {0};
tDot11fIERSN dot11f_ie_rsn = {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 * Clear the buffers so that frame parser knows that there isn't a

2
core/mac/src/pe/lim/lim_process_sme_req_messages.c
View File

@ -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. * denied STA we need to remove this HAL entry.
* So to do that set updateContext to 1 * So to do that set updateContext to 1
*/ */
tSirMacStatusCodes mac_status_code = enum mac_status_code mac_status_code =
eSIR_MAC_UNSPEC_FAILURE_STATUS; eSIR_MAC_UNSPEC_FAILURE_STATUS;
if (!sta_ds->mlmStaContext.updateContext) if (!sta_ds->mlmStaContext.updateContext)

2
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
View File

@ -1242,7 +1242,7 @@ void lim_send_sme_addts_rsp(struct mac_context *mac,
rsp->messageType = eWNI_SME_ADDTS_RSP; rsp->messageType = eWNI_SME_ADDTS_RSP;
rsp->rc = status; rsp->rc = status;
rsp->rsp.status = (enum eSirMacStatusCodes)status; rsp->rsp.status = (enum mac_status_code)status;
rsp->rsp.tspec = tspec; rsp->rsp.tspec = tspec;
rsp->sessionId = smesessionId; rsp->sessionId = smesessionId;

4
core/mac/src/sys/legacy/src/utils/src/parser_api.c
View File

@ -4502,7 +4502,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
/* 'tDot11WMMAddTSResponse' to a 'tSirMacAddtsRspInfo'... */ /* 'tDot11WMMAddTSResponse' to a 'tSirMacAddtsRspInfo'... */
if (ACTION_CATEGORY_QOS == *pFrame) { if (ACTION_CATEGORY_QOS == *pFrame) {
pAddTs->dialogToken = addts.DialogToken.token; pAddTs->dialogToken = addts.DialogToken.token;
pAddTs->status = (tSirMacStatusCodes) addts.Status.status; pAddTs->status = (enum mac_status_code)addts.Status.status;
if (addts.TSDelay.present) { if (addts.TSDelay.present) {
convert_ts_delay(mac, &pAddTs->delay, &addts.TSDelay); convert_ts_delay(mac, &pAddTs->delay, &addts.TSDelay);
@ -4591,7 +4591,7 @@ sir_convert_addts_rsp2_struct(struct mac_context *mac,
} else { } else {
pAddTs->dialogToken = wmmaddts.DialogToken.token; pAddTs->dialogToken = wmmaddts.DialogToken.token;
pAddTs->status = pAddTs->status =
(tSirMacStatusCodes) wmmaddts.StatusCode.statusCode; (enum mac_status_code)wmmaddts.StatusCode.statusCode;
if (wmmaddts.WMMTSPEC.present) { if (wmmaddts.WMMTSPEC.present) {
pAddTs->wmeTspecPresent = 1; pAddTs->wmeTspecPresent = 1;

6
core/sme/src/csr/csr_api_roam.c
View File

@ -11211,7 +11211,7 @@ static bool csr_is_sae_peer_allowed(struct mac_context *mac_ctx,
struct csr_roam_session *session, struct csr_roam_session *session,
tSirMacAddr peer_mac_addr, tSirMacAddr peer_mac_addr,
tDot11fIERSN *rsn_ie, tDot11fIERSN *rsn_ie,
tSirMacStatusCodes *mac_status_code) enum mac_status_code *mac_status_code)
{ {
bool is_allowed = false; 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; QDF_STATUS status;
struct csr_roam_info *roam_info; struct csr_roam_info *roam_info;
struct assoc_ind *pAssocInd; 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; eCsrAuthType csr_akm_type;
sme_debug("Receive WNI_SME_ASSOC_IND from SME"); 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, QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac,
struct assoc_ind *pAssocInd, struct assoc_ind *pAssocInd,
QDF_STATUS Halstatus, QDF_STATUS Halstatus,
tSirMacStatusCodes mac_status_code) enum mac_status_code mac_status_code)
{ {
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
struct assoc_cnf *pMsg; struct assoc_cnf *pMsg;

2
core/sme/src/csr/csr_inside_api.h
View File

@ -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, QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac,
struct assoc_ind *pAssocInd, struct assoc_ind *pAssocInd,
QDF_STATUS status, 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, QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac,
uint32_t sessionId, uint32_t sessionId,
eCsrRoamBssType bssType, eCsrRoamBssType bssType,