diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index a025751ec3eb..08a5c00b00d8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -432,7 +432,7 @@ struct sir_set_antenna_mode { }; /** - * enum tSirBssType - Enum for BSS type used in scanning/joining etc. + * enum bss_type - Enum for BSS type used in scanning/joining etc. * * @eSIR_INFRASTRUCTURE_MODE: Infrastructure station * @eSIR_INFRA_AP_MODE: softAP mode @@ -441,7 +441,7 @@ struct sir_set_antenna_mode { * @eSIR_MONITOR_MODE: Monitor mode * @eSIR_NDI_MODE: NAN datapath mode */ -typedef enum eSirBssType { +enum bss_type { eSIR_INFRASTRUCTURE_MODE, eSIR_INFRA_AP_MODE, eSIR_IBSS_MODE, @@ -449,7 +449,7 @@ typedef enum eSirBssType { eSIR_MONITOR_MODE, eSIR_NDI_MODE, eSIR_DONOT_USE_BSS_TYPE = SIR_MAX_ENUM_SIZE -} tSirBssType; +}; /* / Power Capability info used in 11H */ struct power_cap_info { @@ -570,7 +570,7 @@ struct start_bss_req { #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH uint8_t cc_switch_mode; #endif - tSirBssType bssType; + enum bss_type bssType; tSirMacSSid ssId; uint8_t channelId; ePhyChanBondState cbMode; @@ -716,7 +716,7 @@ struct start_bss_rsp { uint16_t length; uint8_t sessionId; tSirResultCodes statusCode; - tSirBssType bssType; /* Add new type for WDS mode */ + enum bss_type bssType; /* Add new type for WDS mode */ uint16_t beaconInterval; /* Beacon Interval for both type */ uint32_t staId; /* Station ID for Self */ #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -888,7 +888,7 @@ struct join_req { uint8_t sessionId; tSirMacSSid ssId; tSirMacAddr selfMacAddr; /* self Mac address */ - tSirBssType bsstype; /* add new type for BT-AMP STA and AP Modules */ + enum bss_type bsstype; /* add new type for BT-AMP STA and AP Modules */ uint8_t dot11mode; /* to support BT-AMP */ #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH uint8_t cc_switch_mode; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 11da0deaa8f1..b489e3480e1e 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -156,7 +156,7 @@ struct pe_session { tLimSmeStates limSmeState; /* SME State */ tLimSmeStates limPrevSmeState; /* Previous SME State */ tLimSystemRole limSystemRole; - tSirBssType bssType; + enum bss_type bssType; uint8_t operMode; /* AP - 0; STA - 1 ; */ tSirNwType nwType; struct start_bss_req *pLimStartBssReq; /* handle to start bss req */ @@ -629,7 +629,7 @@ static inline void pe_free_dph_node_array_buffer(void) struct pe_session *pe_create_session(struct mac_context *mac, uint8_t *bssid, uint8_t *sessionId, - uint16_t numSta, tSirBssType bssType, + uint16_t numSta, enum bss_type bssType, uint8_t sme_session_id); /** diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index e01a2f37b78e..9a09c8001b86 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -2555,7 +2555,7 @@ void lim_process_mlm_add_bss_rsp(struct mac_context *mac_ctx, tLimMlmStartCnf mlm_start_cnf; struct pe_session *session_entry; tpAddBssParams add_bss_param = (tpAddBssParams) (msg->bodyptr); - tSirBssType bss_type; + enum bss_type bss_type; if (!add_bss_param) { pe_err("Encountered NULL Pointer"); diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 0f47489786de..da79557c745e 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -361,7 +361,7 @@ static void pe_init_fils_info(struct pe_session *session) { } */ #ifdef FEATURE_WLAN_TDLS static inline uint8_t -lim_get_peer_idxpool_size(uint16_t num_sta, tSirBssType bss_type) +lim_get_peer_idxpool_size(uint16_t num_sta, enum bss_type bss_type) { /* * In station role, index 1 is reserved for peer @@ -376,7 +376,7 @@ lim_get_peer_idxpool_size(uint16_t num_sta, tSirBssType bss_type) } #else static inline uint8_t -lim_get_peer_idxpool_size(uint16_t num_sta, tSirBssType bss_type) +lim_get_peer_idxpool_size(uint16_t num_sta, enum bss_type bss_type) { return num_sta + 1; } @@ -388,7 +388,7 @@ void lim_set_bcn_probe_filter(struct mac_context *mac_ctx, uint8_t sap_channel) { struct mgmt_beacon_probe_filter *filter; - tSirBssType bss_type; + enum bss_type bss_type; uint8_t session_id; tSirMacAddr *bssid; @@ -447,7 +447,7 @@ void lim_reset_bcn_probe_filter(struct mac_context *mac_ctx, struct pe_session *session) { struct mgmt_beacon_probe_filter *filter; - tSirBssType bss_type; + enum bss_type bss_type; uint8_t session_id; if (!session) { @@ -495,7 +495,7 @@ void lim_update_bcn_probe_filter(struct mac_context *mac_ctx, struct pe_session *session) { struct mgmt_beacon_probe_filter *filter; - tSirBssType bss_type; + enum bss_type bss_type; uint8_t session_id; if (!session) { @@ -531,7 +531,7 @@ void lim_update_bcn_probe_filter(struct mac_context *mac_ctx, struct pe_session *pe_create_session(struct mac_context *mac, uint8_t *bssid, uint8_t *sessionId, - uint16_t numSta, tSirBssType bssType, + uint16_t numSta, enum bss_type bssType, uint8_t sme_session_id) { QDF_STATUS status; diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index f32a0d202140..273ee5c4c716 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -144,7 +144,7 @@ enum eChannelChangeReasonCodes { typedef struct sLimMlmStartReq { tSirMacSSid ssId; - tSirBssType bssType; + enum bss_type bssType; tSirMacAddr bssId; tSirMacBeaconInterval beaconPeriod; uint8_t dtimPeriod; diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index d7346ea89045..07251f2023bf 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -305,7 +305,7 @@ bool csr_is_bssid_match(struct qdf_mac_addr *pProfBssid, void csr_add_rate_bitmap(uint8_t rate, uint16_t *pRateBitmap); bool csr_check_rate_bitmap(uint8_t rate, uint16_t RateBitmap); bool csr_rates_is_dot11_rate_supported(struct mac_context *mac_ctx, uint8_t rate); -tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype); +enum bss_type csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype); /* Caller allocates memory for pIEStruct */ QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx, tSirBssDescription *pBssDesc, diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 8b6353e626c8..650ae3fa6f60 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -5989,9 +5989,9 @@ tSirScanType csr_get_scan_type(struct mac_context *mac, uint8_t chnId) return scanType; } -tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype) +enum bss_type csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype) { - tSirBssType ret; + enum bss_type ret; switch (csrtype) { case eCSR_BSS_TYPE_INFRASTRUCTURE: diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 1901334daaf1..cde3c938fcfe 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -421,7 +421,7 @@ typedef struct sLimMlmSetKeysReq { typedef struct { tSirMacAddr bssId; tSirMacAddr selfMacAddr; - tSirBssType bssType; + enum bss_type bssType; uint8_t operMode; tSirNwType nwType; uint8_t shortSlotTimeSupported;