From 6177126e67c673d9aa5546ba327802406715b64e Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 1 Apr 2019 11:55:19 -0700 Subject: [PATCH] qcacld-3.0: Consolidate SIR_MAC_EID_* to WLAN_ELEMID_* Remove the element ID macros defined in qcacld-3.0 and replace it with the macros defined in qcacmn. Change-Id: I01a38e3d6c4857eb48868a34e278366ad9d5d099 CRs-Fixed: 2427311 --- core/hdd/inc/wlan_hdd_main.h | 1 - core/hdd/src/wlan_hdd_assoc.c | 18 ++--- core/hdd/src/wlan_hdd_cfg80211.c | 4 +- core/hdd/src/wlan_hdd_hostapd.c | 6 +- core/mac/inc/sir_api.h | 1 - core/mac/inc/sir_mac_prot_def.h | 52 +------------ core/mac/src/pe/lim/lim_api.c | 2 +- core/mac/src/pe/lim/lim_assoc_utils.c | 30 +++---- .../src/pe/lim/lim_process_assoc_req_frame.c | 10 +-- core/mac/src/pe/lim/lim_process_auth_frame.c | 10 +-- core/mac/src/pe/lim/lim_process_fils.c | 4 +- .../src/pe/lim/lim_process_mlm_req_messages.c | 6 +- .../src/pe/lim/lim_process_sme_req_messages.c | 4 +- core/mac/src/pe/lim/lim_process_tdls.c | 4 +- .../src/pe/lim/lim_send_management_frames.c | 8 +- core/mac/src/pe/lim/lim_sme_req_utils.c | 10 +-- core/mac/src/pe/lim/lim_utils.c | 2 +- core/mac/src/pe/sch/sch_beacon_gen.c | 44 +++++------ .../src/sys/legacy/src/utils/src/parser_api.c | 78 +++++++++---------- core/sme/src/csr/csr_api_roam.c | 28 ++++--- core/sme/src/csr/csr_util.c | 2 +- 21 files changed, 140 insertions(+), 184 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index e7dd42373c62..d855172bf7c7 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -637,7 +637,6 @@ enum wapi_auth_mode { #define WPA_GET_LE16(a) ((u16) (((a)[1] << 8) | (a)[0])) #define WPA_GET_BE24(a) ((u32) ((a[0] << 16) | (a[1] << 8) | a[2])) -#define WLAN_EID_WAPI 68 #define WAPI_PSK_AKM_SUITE 0x02721400 #define WAPI_CERT_AKM_SUITE 0x01721400 diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 9367125d11df..87cd20843af3 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -149,13 +149,13 @@ u8 ccp_rsn_oui_13[HDD_RSN_OUI_SIZE] = {0x50, 0x6F, 0x9A, 0x01}; * beacon_filter_table - table of IEs used for beacon filtering */ static const int beacon_filter_table[] = { - SIR_MAC_DS_PARAM_SET_EID, - SIR_MAC_ERP_INFO_EID, - SIR_MAC_EDCA_PARAM_SET_EID, - SIR_MAC_QOS_CAPABILITY_EID, - SIR_MAC_HT_INFO_EID, - SIR_MAC_VHT_OPMODE_EID, - SIR_MAC_VHT_OPERATION_EID, + WLAN_ELEMID_DSPARMS, + WLAN_ELEMID_ERP, + WLAN_ELEMID_EDCAPARMS, + WLAN_ELEMID_QOS_CAPABILITY, + WLAN_ELEMID_HTINFO_ANA, + WLAN_ELEMID_OP_MODE_NOTIFY, + WLAN_ELEMID_VHTOP, #ifdef WLAN_FEATURE_11AX_BSS_COLOR /* * EID: 221 vendor IE is being used temporarily by 11AX @@ -163,7 +163,7 @@ static const int beacon_filter_table[] = { * vendor EID needs to be replaced with bss-color-change IE * number. */ - SIR_MAC_EID_VENDOR, + WLAN_ELEMID_VENDOR, #endif }; @@ -2371,7 +2371,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, if (!bss) hdd_warn("Get BSS returned NULL"); buf_ptr = buf_ssid_ie; - *buf_ptr = SIR_MAC_SSID_EID; + *buf_ptr = WLAN_ELEMID_SSID; buf_ptr++; *buf_ptr = roam_profile.SSID.length; /*len of ssid*/ buf_ptr++; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index eb5f44d4a2e0..8d5e0d9fc0fb 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -17672,7 +17672,7 @@ static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *adapter, break; } #ifdef FEATURE_WLAN_WAPI - case WLAN_EID_WAPI: + case WLAN_ELEMID_WAPI: /* Setting WAPI Mode to ON=1 */ adapter->wapi_info.wapi_mode = 1; hdd_debug("WAPI MODE IS %u", adapter->wapi_info.wapi_mode); @@ -17730,7 +17730,7 @@ static int wlan_hdd_cfg80211_set_ie(struct hdd_adapter *adapter, return status; break; } - case SIR_MAC_REQUEST_EID_MAX: + case WLAN_REQUEST_IE_MAX_LEN: { if (genie[0] == SIR_FILS_HLP_EXT_EID) { hdd_debug("Set HLP EXT IE(len %d)", diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 35a438cf3aea..3606d98cf249 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -4095,7 +4095,7 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter) #ifdef FEATURE_WLAN_WAPI if (QDF_SAP_MODE == adapter->device_mode) { wlan_hdd_add_extra_ie(adapter, genie, &total_ielen, - WLAN_EID_WAPI); + WLAN_ELEMID_WAPI); } #endif @@ -5345,7 +5345,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter, if (ie) { ie++; - if (ie[0] > SIR_MAC_RATESET_EID_MAX) { + if (ie[0] > WLAN_SUPPORTED_RATES_IE_MAX_LEN) { hdd_err("Invalid supported rates %d", ie[0]); ret = -EINVAL; @@ -5367,7 +5367,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter, beacon->tail_len); if (ie) { ie++; - if (ie[0] > SIR_MAC_RATESET_EID_MAX) { + if (ie[0] > WLAN_SUPPORTED_RATES_IE_MAX_LEN) { hdd_err("Invalid supported rates %d", ie[0]); ret = -EINVAL; diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 1d193fc62f8f..66d16d9e66ed 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -56,7 +56,6 @@ struct mac_context; #define CFG_VALID_CHANNEL_LIST_LEN 100 #define CFG_COUNTRY_CODE_LEN 3 -#define SIR_MDIE_ELEMENT_ID 54 #define SIR_MDIE_SIZE 3 /* MD ID(2 bytes), Capability(1 byte) */ #define SIR_MAX_ELEMENT_ID 255 diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 1f35b1b6da3d..ee10b6f8dc71 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -252,56 +252,10 @@ /* and their min/max lengths */ /* ----------------------------------------------------------------------------- */ -#define SIR_MAC_SSID_EID 0 -#define SIR_MAC_RATESET_EID 1 -#define SIR_MAC_RATESET_EID_MAX 12 -#define SIR_MAC_FH_PARAM_SET_EID 2 -#define SIR_MAC_FH_PARAM_SET_EID_MAX 5 -#define SIR_MAC_DS_PARAM_SET_EID 3 -#define SIR_MAC_DS_PARAM_SET_EID_MAX 1 -#define SIR_MAC_CF_PARAM_SET_EID 4 -#define SIR_MAC_CF_PARAM_SET_EID_MAX 6 -#define SIR_MAC_TIM_EID 5 #define SIR_MAC_TIM_EID_MIN 3 -#define SIR_MAC_IBSS_PARAM_SET_EID 6 -#define SIR_MAC_IBSS_PARAM_SET_EID_MAX 2 -#define SIR_MAC_COUNTRY_EID 7 -#define SIR_MAC_COUNTRY_EID_MAX 254 -#define SIR_MAC_FH_PARAMS_EID 8 -#define SIR_MAC_FH_PARAMS_EID_MAX 4 -#define SIR_MAC_FH_PATTERN_EID 9 -#define SIR_MAC_REQUEST_EID_MAX 255 -#define SIR_MAC_EDCA_PARAM_SET_EID 12 /* EDCA parameter set */ -#define SIR_MAC_CHALLENGE_TEXT_EID 16 -/* reserved 17-31 */ -#define SIR_MAC_PWR_CONSTRAINT_EID 32 -#define SIR_MAC_TPC_RPT_EID 35 -#define SIR_MAC_CHNL_SWITCH_ANN_EID 37 -#define SIR_MAC_ERP_INFO_EID 42 -#define SIR_MAC_QOS_CAPABILITY_EID 46 -#define SIR_MAC_RSN_EID 48 -#define SIR_MAC_EXTENDED_RATE_EID 50 -#define SIR_MAC_CHNL_EXTENDED_SWITCH_ANN_EID 60 - -#define SIR_MAC_OPERATING_CLASS_EID 59 -/* reserved 51-69 */ -#define SIR_MAC_RM_ENABLED_CAPABILITY_EID 70 -#define SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX 5 -/* reserved 71-220 */ #define SIR_MAC_WPA_EID 221 -#define SIR_MAC_EID_VENDOR 221 - -#define SIR_MAC_WAPI_EID 68 -/* reserved 222-254 */ -#define SIR_MAC_HT_CAPABILITIES_EID 45 -#define SIR_MAC_HT_INFO_EID 61 - -#define SIR_MAC_VHT_CAPABILITIES_EID 191 -#define SIR_MAC_VHT_OPERATION_EID 192 -#define SIR_MAC_VHT_EXT_BSS_LOAD_EID 193 -#define SIR_MAC_VHT_OPMODE_EID 199 #define SIR_MAC_MAX_SUPPORTED_MCS_SET 16 #define VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1 390 @@ -797,7 +751,7 @@ typedef struct sSirMacTim { /* The parser assume this to be at least 12 */ typedef struct sSirMacRateSet { uint8_t numRates; - uint8_t rate[SIR_MAC_RATESET_EID_MAX]; + uint8_t rate[WLAN_SUPPORTED_RATES_IE_MAX_LEN]; } qdf_packed tSirMacRateSet; /** struct merged_mac_rate_set - merged mac rate set @@ -806,7 +760,7 @@ typedef struct sSirMacRateSet { */ struct merged_mac_rate_set { uint8_t num_rates; - uint8_t rate[2 * SIR_MAC_RATESET_EID_MAX]; + uint8_t rate[2 * WLAN_SUPPORTED_RATES_IE_MAX_LEN]; }; /* Reserve 1 byte for NULL character in the SSID name field to print in %s */ @@ -1507,7 +1461,7 @@ typedef struct sSirMacAuthFrameBody { uint16_t authAlgoNumber; uint16_t authTransactionSeqNumber; uint16_t authStatusCode; - uint8_t type; /* = SIR_MAC_CHALLENGE_TEXT_EID */ + uint8_t type; /* = WLAN_ELEMID_CHALLENGE */ uint8_t length; /* = SIR_MAC_AUTH_CHALLENGE_LENGTH */ uint8_t challengeText[SIR_MAC_AUTH_CHALLENGE_LENGTH]; #ifdef WLAN_FEATURE_FILS_SK diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 072b969f8f6e..d8cbf51ddfaa 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1104,7 +1104,7 @@ static bool pe_filter_bcn_probe_frame(struct mac_context *mac_ctx, if (!bcn_caps->ibss) return false; - ssid_ie = wlan_get_ie_ptr_from_eid(SIR_MAC_SSID_EID, + ssid_ie = wlan_get_ie_ptr_from_eid(WLAN_ELEMID_SSID, body + SIR_MAC_B_PR_SSID_OFFSET, frame_len); diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index f62af65acacf..428f12073318 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -198,7 +198,7 @@ lim_check_rx_basic_rates(struct mac_context *mac, tSirMacRateSet rxRateSet, /* Extract BSS basic rateset from operational rateset */ for (i = 0, j = 0; - ((i < pRateSet->numRates) && (i < SIR_MAC_RATESET_EID_MAX)); i++) { + ((i < pRateSet->numRates) && (i < WLAN_SUPPORTED_RATES_IE_MAX_LEN)); i++) { if ((pRateSet->rate[i] & 0x80) == 0x80) { /* msb is set, so this is a basic rate */ basicRate.rate[j++] = pRateSet->rate[i]; @@ -213,7 +213,7 @@ lim_check_rx_basic_rates(struct mac_context *mac, tSirMacRateSet rxRateSet, match = 0; for (i = 0; ((i < rxRateSet.numRates) - && (i < SIR_MAC_RATESET_EID_MAX)); i++) { + && (i < WLAN_SUPPORTED_RATES_IE_MAX_LEN)); i++) { if ((rxRateSet.rate[i] | 0x80) == basicRate.rate[k]) match = 1; } @@ -1553,7 +1553,7 @@ QDF_STATUS lim_populate_own_rate_set(struct mac_context *mac_ctx, is_arate = 0; for (j = 0; (j < temp_rate_set.numRates) && - (j < SIR_MAC_RATESET_EID_MAX); j++) { + (j < WLAN_SUPPORTED_RATES_IE_MAX_LEN); j++) { if ((uint32_t) (temp_rate_set.rate[j] & 0x7f) < val) { val = temp_rate_set.rate[j] & 0x7f; @@ -1645,13 +1645,13 @@ QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, qdf_size_t val_len; /* copy operational rate set from pe_session */ - if (pe_session->rateSet.numRates <= SIR_MAC_RATESET_EID_MAX) { + if (pe_session->rateSet.numRates <= WLAN_SUPPORTED_RATES_IE_MAX_LEN) { qdf_mem_copy((uint8_t *) tempRateSet.rate, (uint8_t *) (pe_session->rateSet.rate), pe_session->rateSet.numRates); tempRateSet.numRates = pe_session->rateSet.numRates; } else { - pe_err("more than SIR_MAC_RATESET_EID_MAX rates"); + pe_err("more than WLAN_SUPPORTED_RATES_IE_MAX_LEN rates"); return QDF_STATUS_E_FAILURE; } if ((pe_session->dot11mode == MLME_DOT11_MODE_11G) || @@ -1659,7 +1659,7 @@ QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, (pe_session->dot11mode == MLME_DOT11_MODE_11AC) || (pe_session->dot11mode == MLME_DOT11_MODE_11N)) { if (pe_session->extRateSet.numRates <= - SIR_MAC_RATESET_EID_MAX) { + WLAN_SUPPORTED_RATES_IE_MAX_LEN) { qdf_mem_copy((uint8_t *) tempRateSet2.rate, (uint8_t *) (pe_session->extRateSet. rate), @@ -1667,13 +1667,13 @@ QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, tempRateSet2.numRates = pe_session->extRateSet.numRates; } else { - pe_err("pe_session->extRateSet.numRates more than SIR_MAC_RATESET_EID_MAX rates"); + pe_err("pe_session->extRateSet.numRates more than WLAN_SUPPORTED_RATES_IE_MAX_LEN rates"); return QDF_STATUS_E_FAILURE; } } else tempRateSet2.numRates = 0; if ((tempRateSet.numRates + tempRateSet2.numRates) > - SIR_MAC_RATESET_EID_MAX) { + WLAN_SUPPORTED_RATES_IE_MAX_LEN) { pe_err("more than 12 rates in CFG"); return QDF_STATUS_E_FAILURE; } @@ -1698,7 +1698,7 @@ QDF_STATUS lim_populate_peer_rate_set(struct mac_context *mac, isArate = 0; for (j = 0; (j < tempRateSet.numRates) - && (j < SIR_MAC_RATESET_EID_MAX); j++) { + && (j < WLAN_SUPPORTED_RATES_IE_MAX_LEN); j++) { if ((uint32_t) (tempRateSet.rate[j] & 0x7f) < val) { val = tempRateSet.rate[j] & 0x7f; @@ -1905,7 +1905,7 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, * unicity of the rates so there cannot be more than 12 */ for (i = 0; (i < oper_rate_set->numRates && - i < SIR_MAC_RATESET_EID_MAX); i++) + i < WLAN_SUPPORTED_RATES_IE_MAX_LEN); i++) temp_rate_set.rate[i] = oper_rate_set->rate[i]; temp_rate_set.numRates = oper_rate_set->numRates; @@ -1920,7 +1920,7 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, int tail = temp_rate_set.numRates; for (i = 0; (i < ext_rate_set->numRates && - i < SIR_MAC_RATESET_EID_MAX); i++) { + i < WLAN_SUPPORTED_RATES_IE_MAX_LEN); i++) { found = 0; for (j = 0; j < (uint32_t) tail; j++) { if ((temp_rate_set.rate[j] & 0x7F) == @@ -1940,8 +1940,8 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, } else if (ext_rate_set->numRates && ((temp_rate_set.numRates + ext_rate_set->numRates) <= 12)) { for (j = 0; ((j < ext_rate_set->numRates) && - (j < SIR_MAC_RATESET_EID_MAX) && - ((i + j) < SIR_MAC_RATESET_EID_MAX)); j++) + (j < WLAN_SUPPORTED_RATES_IE_MAX_LEN) && + ((i + j) < WLAN_SUPPORTED_RATES_IE_MAX_LEN)); j++) temp_rate_set.rate[i + j] = ext_rate_set->rate[j]; temp_rate_set.numRates += ext_rate_set->numRates; @@ -1952,9 +1952,9 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, rates = &sta_ds->supportedRates; qdf_mem_zero(rates, sizeof(*rates)); for (i = 0; (i < temp_rate_set2.numRates && - i < SIR_MAC_RATESET_EID_MAX); i++) { + i < WLAN_SUPPORTED_RATES_IE_MAX_LEN); i++) { for (j = 0; (j < temp_rate_set.numRates && - j < SIR_MAC_RATESET_EID_MAX); j++) { + j < WLAN_SUPPORTED_RATES_IE_MAX_LEN); j++) { if ((temp_rate_set2.rate[i] & 0x7F) != (temp_rate_set.rate[j] & 0x7F)) continue; 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 1a9eed8369b5..70d22c78f256 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 @@ -399,13 +399,13 @@ static bool lim_chk_rates(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, basic_rates.numRates = 0; for (i = 0; i < assoc_req->supportedRates.numRates - && (i < SIR_MAC_RATESET_EID_MAX); i++) { + && (i < WLAN_SUPPORTED_RATES_IE_MAX_LEN); i++) { basic_rates.rate[i] = assoc_req->supportedRates.rate[i]; basic_rates.numRates++; } for (j = 0; (j < assoc_req->extendedRates.numRates) - && (i < SIR_MAC_RATESET_EID_MAX); i++, j++) { + && (i < WLAN_SUPPORTED_RATES_IE_MAX_LEN); i++, j++) { basic_rates.rate[i] = assoc_req->extendedRates.rate[j]; basic_rates.numRates++; } @@ -2385,7 +2385,7 @@ static void lim_fill_assoc_ind_wapi_info(struct mac_context *mac_ctx, if (assoc_req->wapiPresent && (!wpsie)) { pe_debug("Received WAPI IE length in Assoc Req is %d", assoc_req->wapi.length); - assoc_ind->wapiIE.wapiIEdata[0] = SIR_MAC_WAPI_EID; + assoc_ind->wapiIE.wapiIEdata[0] = WLAN_ELEMID_WAPI; assoc_ind->wapiIE.wapiIEdata[1] = assoc_req->wapi.length; qdf_mem_copy(&assoc_ind->wapiIE.wapiIEdata[2], assoc_req->wapi.info, assoc_req->wapi.length); @@ -2612,7 +2612,7 @@ void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx, pe_debug("Assoc Req RSN IE len: %d", assoc_req->rsn.length); assoc_ind->rsnIE.length = 2 + assoc_req->rsn.length; - assoc_ind->rsnIE.rsnIEdata[0] = SIR_MAC_RSN_EID; + assoc_ind->rsnIE.rsnIEdata[0] = WLAN_ELEMID_RSN; assoc_ind->rsnIE.rsnIEdata[1] = assoc_req->rsn.length; qdf_mem_copy(&assoc_ind->rsnIE.rsnIEdata[2], @@ -2676,7 +2676,7 @@ void lim_send_mlm_assoc_ind(struct mac_context *mac_ctx, if (assoc_ind->addIE.length + DOT11F_IE_HTCAPS_MIN_LEN + 2 < WLAN_MAX_IE_LEN) { assoc_ind->addIE.addIEdata[rsn_len] = - SIR_MAC_HT_CAPABILITIES_EID; + WLAN_ELEMID_HTCAP_ANA; assoc_ind->addIE.addIEdata[rsn_len + 1] = DOT11F_IE_HTCAPS_MIN_LEN; qdf_mem_copy( diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 2031818a6181..3c7cfecf179d 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -56,7 +56,7 @@ * - AUTH1 and AUTH3 must be received in AP mode * - AUTH2 and AUTH4 must be received in STA mode * - AUTH3 and AUTH4 must have challenge text IE, that is,'type' field has been set to - * SIR_MAC_CHALLENGE_TEXT_EID by parser + * WLAN_ELEMID_CHALLENGE by parser * - * ***ASSUMPTIONS: @@ -86,7 +86,7 @@ static inline unsigned int is_auth_valid(struct mac_context *mac, if (((auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_3) || (auth->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_4)) && - (auth->type != SIR_MAC_CHALLENGE_TEXT_EID) && + (auth->type != WLAN_ELEMID_CHALLENGE) && (auth->authAlgoNumber != eSIR_SHARED_KEY)) valid = 0; @@ -223,7 +223,7 @@ static void lim_process_auth_shared_system_algo(struct mac_context *mac_ctx, auth_frame->authTransactionSeqNumber = rx_auth_frm_body->authTransactionSeqNumber + 1; auth_frame->authStatusCode = eSIR_MAC_SUCCESS_STATUS; - auth_frame->type = SIR_MAC_CHALLENGE_TEXT_EID; + auth_frame->type = WLAN_ELEMID_CHALLENGE; auth_frame->length = SIR_MAC_SAP_AUTH_CHALLENGE_LENGTH; qdf_mem_copy(auth_frame->challengeText, auth_node->challengeText, @@ -806,7 +806,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx, pe_session); return; } - if (rx_auth_frm_body->type != SIR_MAC_CHALLENGE_TEXT_EID) { + if (rx_auth_frm_body->type != WLAN_ELEMID_CHALLENGE) { pe_err("rx auth frm with invalid challenge txtie"); return; } @@ -857,7 +857,7 @@ static void lim_process_auth_frame_type2(struct mac_context *mac_ctx, ((tpSirMacAuthFrameBody)plainbody)->authStatusCode = eSIR_MAC_SUCCESS_STATUS; ((tpSirMacAuthFrameBody)plainbody)->type = - SIR_MAC_CHALLENGE_TEXT_EID; + WLAN_ELEMID_CHALLENGE; ((tpSirMacAuthFrameBody)plainbody)->length = rx_auth_frm_body->length; qdf_mem_copy((uint8_t *) ( diff --git a/core/mac/src/pe/lim/lim_process_fils.c b/core/mac/src/pe/lim/lim_process_fils.c index 9b10ea5bb141..3337f1c97c37 100644 --- a/core/mac/src/pe/lim/lim_process_fils.c +++ b/core/mac/src/pe/lim/lim_process_fils.c @@ -1008,7 +1008,7 @@ void lim_add_fils_data_to_auth_frame(struct pe_session *session, if (bss_desc->mdiePresent) { /* Populate MDIE received from AP */ - *body = SIR_MDIE_ELEMENT_ID; + *body = WLAN_ELEMID_MOBILITY_DOMAIN; body++; *body = SIR_MDIE_SIZE; body++; @@ -1523,7 +1523,7 @@ static QDF_STATUS find_ie_data_after_fils_session_ie(struct mac_context *mac_ctx if (elem_len > left) return QDF_STATUS_E_FAILURE; - if (elem_id == SIR_MAC_REQUEST_EID_MAX && + if (elem_id == WLAN_REQUEST_IE_MAX_LEN && ptr[2] == SIR_FILS_SESSION_EXT_EID) { (*ie) = ((&ptr[1]) + ptr[1] + 1); (*ie_len) = (left - elem_len); diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index b63bef7e237e..4219ce636e1c 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -337,11 +337,11 @@ lim_mlm_add_bss(struct mac_context *mac_ctx, mlm_start_req->cfParamSet.cfpDurRemaining; addbss_param->rateSet.numRates = mlm_start_req->rateSet.numRates; - if (addbss_param->rateSet.numRates > SIR_MAC_RATESET_EID_MAX) { + if (addbss_param->rateSet.numRates > WLAN_SUPPORTED_RATES_IE_MAX_LEN) { pe_warn("num of sup rates %d exceeding the limit %d, resetting", addbss_param->rateSet.numRates, - SIR_MAC_RATESET_EID_MAX); - addbss_param->rateSet.numRates = SIR_MAC_RATESET_EID_MAX; + WLAN_SUPPORTED_RATES_IE_MAX_LEN); + addbss_param->rateSet.numRates = WLAN_SUPPORTED_RATES_IE_MAX_LEN; } qdf_mem_copy(addbss_param->rateSet.rate, mlm_start_req->rateSet.rate, addbss_param->rateSet.numRates); 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 c8aa31c1d053..fa5aa08b2801 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 @@ -4240,7 +4240,7 @@ static void lim_set_pdev_ht_ie(struct mac_context *mac_ctx, uint8_t pdev_id, qdf_mem_free(ie_params); return; } - *ie_params->ie_ptr = SIR_MAC_HT_CAPABILITIES_EID; + *ie_params->ie_ptr = WLAN_ELEMID_HTCAP_ANA; *(ie_params->ie_ptr + 1) = ie_params->ie_len - 2; lim_set_ht_caps(mac_ctx, NULL, ie_params->ie_ptr, ie_params->ie_len); @@ -4310,7 +4310,7 @@ static void lim_set_pdev_vht_ie(struct mac_context *mac_ctx, uint8_t pdev_id, qdf_mem_free(ie_params); return; } - *ie_params->ie_ptr = SIR_MAC_VHT_CAPABILITIES_EID; + *ie_params->ie_ptr = WLAN_ELEMID_VHTCAP; *(ie_params->ie_ptr + 1) = ie_params->ie_len - 2; lim_set_vht_caps(mac_ctx, NULL, ie_params->ie_ptr, ie_params->ie_len); diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index aaf3048fe80a..5cea90971a37 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -2315,10 +2315,10 @@ lim_tdls_populate_matching_rate_set(struct mac_context *mac_ctx, * Copy received rates in temp_rate_set, the parser has ensured * unicity of the rates so there cannot be more than 12 . */ - if (supp_rates_len > SIR_MAC_RATESET_EID_MAX) { + if (supp_rates_len > WLAN_SUPPORTED_RATES_IE_MAX_LEN) { pe_warn("Supported rates length: %d more than the Max limit, reset to Max", supp_rates_len); - supp_rates_len = SIR_MAC_RATESET_EID_MAX; + supp_rates_len = WLAN_SUPPORTED_RATES_IE_MAX_LEN; } for (i = 0; i < supp_rates_len; i++) diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 9d6d3cadaad0..28b0c76ac6e5 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -464,7 +464,7 @@ static QDF_STATUS lim_get_addn_ie_for_probe_resp(struct mac_context *mac, qdf_mem_free(tempbuf); return QDF_STATUS_E_FAILURE; } - if (!((SIR_MAC_EID_VENDOR == elem_id) && + if (!((WLAN_ELEMID_VENDOR == elem_id) && (memcmp (&ptr[2], SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE) == 0))) { @@ -1919,7 +1919,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx, goto end; qdf_status = lim_strip_ie(mac_ctx, add_ie, &add_ie_len, - SIR_MAC_EID_VENDOR, ONE_BYTE, + WLAN_ELEMID_VENDOR, ONE_BYTE, SIR_MAC_MBO_OUI, SIR_MAC_MBO_OUI_SIZE, mbo_ie, DOT11F_IE_MBO_IE_MAX_LEN); @@ -2462,7 +2462,7 @@ alloc_packet: } else if (session->ftPEContext. pFTPreAuthReq->pbssDescription) { /* MDID attr is 54 */ - *body = SIR_MDIE_ELEMENT_ID; + *body = WLAN_ELEMID_MOBILITY_DOMAIN; body++; *body = SIR_MDIE_SIZE; body++; @@ -4015,7 +4015,7 @@ lim_send_link_report_action_frame(struct mac_context *mac, /* in the middle of other fixed fields in the link report frame(IEEE Std. 802.11k section7.4.6.4 */ /* and frame parser always expects IEs to come after all fixed fields. It is easier to handle */ /* such case this way than changing the frame parser. */ - frm.TPCEleID.TPCId = SIR_MAC_TPC_RPT_EID; + frm.TPCEleID.TPCId = WLAN_ELEMID_TPCREP; frm.TPCEleLen.TPCLen = 2; frm.TxPower.txPower = pLinkReport->txPower; frm.LinkMargin.linkMargin = 0; diff --git a/core/mac/src/pe/lim/lim_sme_req_utils.c b/core/mac/src/pe/lim/lim_sme_req_utils.c index 839a0355d44b..771efb303e83 100644 --- a/core/mac/src/pe/lim/lim_sme_req_utils.c +++ b/core/mac/src/pe/lim/lim_sme_req_utils.c @@ -239,15 +239,15 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(struct mac_context *mac_ctx, if (!rsn_ie->length) return true; - if ((rsn_ie->rsnIEdata[0] != SIR_MAC_RSN_EID) && + if ((rsn_ie->rsnIEdata[0] != WLAN_ELEMID_RSN) && (rsn_ie->rsnIEdata[0] != SIR_MAC_WPA_EID)) { pe_err("RSN/WPA EID: %d not [%d || %d]", - rsn_ie->rsnIEdata[0], SIR_MAC_RSN_EID, + rsn_ie->rsnIEdata[0], WLAN_ELEMID_RSN, SIR_MAC_WPA_EID); return false; } /* Check validity of RSN IE */ - if ((rsn_ie->rsnIEdata[0] == SIR_MAC_RSN_EID) && + if ((rsn_ie->rsnIEdata[0] == WLAN_ELEMID_RSN) && (rsn_ie->rsnIEdata[1] < SIR_MAC_RSN_IE_MIN_LENGTH)) { pe_err("RSN IE len: %d not [%d,%d]", rsn_ie->rsnIEdata[1], SIR_MAC_RSN_IE_MIN_LENGTH, @@ -256,7 +256,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(struct mac_context *mac_ctx, } if (rsn_ie->length > rsn_ie->rsnIEdata[1] + 2) { - if (rsn_ie->rsnIEdata[0] != SIR_MAC_RSN_EID) { + if (rsn_ie->rsnIEdata[0] != WLAN_ELEMID_RSN) { pe_err("First byte: %d in rsnIEdata isn't RSN_EID", rsn_ie->rsnIEdata[1]); return false; @@ -264,7 +264,7 @@ lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(struct mac_context *mac_ctx, pe_debug("WPA IE is present along with WPA2 IE"); wpa_idx = 2 + rsn_ie->rsnIEdata[1]; } else if ((rsn_ie->length == rsn_ie->rsnIEdata[1] + 2) && - (rsn_ie->rsnIEdata[0] == SIR_MAC_RSN_EID)) { + (rsn_ie->rsnIEdata[0] == WLAN_ELEMID_RSN)) { pe_debug("Only RSN IE is present"); ret = dot11f_unpack_ie_rsn(mac_ctx, &rsn_ie->rsnIEdata[2], rsn_ie->rsnIEdata[1], diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index d4d06765f645..351a41d57f75 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -5049,7 +5049,7 @@ uint8_t lim_build_p2p_ie(struct mac_context *mac, uint8_t *ie, uint8_t *data, int length = 0; uint8_t *ptr = ie; - ptr[length++] = SIR_MAC_EID_VENDOR; + ptr[length++] = WLAN_ELEMID_VENDOR; ptr[length++] = ie_len + SIR_MAC_P2P_OUI_SIZE; qdf_mem_copy(&ptr[length], SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE); qdf_mem_copy(&ptr[length + SIR_MAC_P2P_OUI_SIZE], data, ie_len); diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index 35bc9f7d43ca..2b1fe2841fa1 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -122,14 +122,14 @@ sch_append_addn_ie(struct mac_context *mac_ctx, struct pe_session *session, * expect P2P IE at the end of beacon buffer and will result in * beacon corruption if P2P IE is not at end of beacon buffer. */ - status = lim_strip_ie(mac_ctx, addn_ie, &addn_ielen, SIR_MAC_EID_VENDOR, + status = lim_strip_ie(mac_ctx, addn_ie, &addn_ielen, WLAN_ELEMID_VENDOR, ONE_BYTE, SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE, ext_p2p_ie, DOT11F_IE_P2PBEACON_MAX_LEN); qdf_mem_copy(&add_ie[0], addn_ie, addn_ielen); if (status == QDF_STATUS_SUCCESS && - ext_p2p_ie[0] == SIR_MAC_EID_VENDOR && + ext_p2p_ie[0] == WLAN_ELEMID_VENDOR && !qdf_mem_cmp(&ext_p2p_ie[2], SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE)) { qdf_mem_copy(&add_ie[addn_ielen], ext_p2p_ie, @@ -577,7 +577,7 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess populate_dot11f_operating_mode(mac_ctx, &bcn_2->OperatingMode, session); lim_strip_ie(mac_ctx, addn_ie, &addn_ielen, - SIR_MAC_VHT_OPMODE_EID, ONE_BYTE, NULL, 0, + WLAN_ELEMID_OP_MODE_NOTIFY, ONE_BYTE, NULL, 0, NULL, SIR_MAC_VHT_OPMODE_SIZE - 2); } @@ -670,13 +670,13 @@ lim_update_probe_rsp_template_ie_bitmap_beacon1(struct mac_context *mac, /* SSID */ if (beacon1->SSID.present) { - set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_SSID_EID); + set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, WLAN_ELEMID_SSID); /* populating it, because probe response has to go with SSID even in hidden case */ populate_dot11f_ssid(mac, &pe_session->ssId, &prb_rsp->SSID); } /* supported rates */ if (beacon1->SuppRates.present) { - set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_RATESET_EID); + set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, WLAN_ELEMID_RATES); qdf_mem_copy((void *)&prb_rsp->SuppRates, (void *)&beacon1->SuppRates, sizeof(beacon1->SuppRates)); @@ -685,7 +685,7 @@ lim_update_probe_rsp_template_ie_bitmap_beacon1(struct mac_context *mac, /* DS Parameter set */ if (beacon1->DSParams.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_DS_PARAM_SET_EID); + WLAN_ELEMID_DSPARMS); qdf_mem_copy((void *)&prb_rsp->DSParams, (void *)&beacon1->DSParams, sizeof(beacon1->DSParams)); @@ -704,7 +704,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* IBSS parameter set - will not be present in probe response tx by AP */ /* country */ if (beacon2->Country.present) { - set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_COUNTRY_EID); + set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, WLAN_ELEMID_COUNTRY); qdf_mem_copy((void *)&prb_rsp->Country, (void *)&beacon2->Country, sizeof(beacon2->Country)); @@ -713,16 +713,16 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* Power constraint */ if (beacon2->PowerConstraints.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_PWR_CONSTRAINT_EID); + WLAN_ELEMID_PWRCNSTR); qdf_mem_copy((void *)&prb_rsp->PowerConstraints, (void *)&beacon2->PowerConstraints, sizeof(beacon2->PowerConstraints)); } - /* Channel Switch Annoouncement SIR_MAC_CHNL_SWITCH_ANN_EID */ + /* Channel Switch Annoouncement WLAN_ELEMID_CHANSWITCHANN */ if (beacon2->ChanSwitchAnn.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_CHNL_SWITCH_ANN_EID); + WLAN_ELEMID_CHANSWITCHANN); qdf_mem_copy((void *)&prb_rsp->ChanSwitchAnn, (void *)&beacon2->ChanSwitchAnn, sizeof(beacon2->ChanSwitchAnn)); @@ -732,7 +732,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* EXT Channel Switch Announcement CHNL_EXTENDED_SWITCH_ANN_EID*/ if (beacon2->ext_chan_switch_ann.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_CHNL_EXTENDED_SWITCH_ANN_EID); + WLAN_ELEMID_EXTCHANSWITCHANN); qdf_mem_copy((void *)&prb_rsp->ext_chan_switch_ann, (void *)&beacon2->ext_chan_switch_ann, sizeof(beacon2->ext_chan_switch_ann)); @@ -741,7 +741,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* Supported operating class */ if (beacon2->SuppOperatingClasses.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_OPERATING_CLASS_EID); + WLAN_ELEMID_SUPP_OP_CLASS); qdf_mem_copy((void *)&prb_rsp->SuppOperatingClasses, (void *)&beacon2->SuppOperatingClasses, sizeof(beacon2->SuppOperatingClasses)); @@ -759,7 +759,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* ERP information */ if (beacon2->ERPInfo.present) { - set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_ERP_INFO_EID); + set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, WLAN_ELEMID_ERP); qdf_mem_copy((void *)&prb_rsp->ERPInfo, (void *)&beacon2->ERPInfo, sizeof(beacon2->ERPInfo)); @@ -768,7 +768,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* Extended supported rates */ if (beacon2->ExtSuppRates.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_EXTENDED_RATE_EID); + WLAN_ELEMID_XRATES); qdf_mem_copy((void *)&prb_rsp->ExtSuppRates, (void *)&beacon2->ExtSuppRates, sizeof(beacon2->ExtSuppRates)); @@ -785,7 +785,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* RSN */ if (beacon2->RSNOpaque.present) { - set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_RSN_EID); + set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, WLAN_ELEMID_RSN); qdf_mem_copy((void *)&prb_rsp->RSNOpaque, (void *)&beacon2->RSNOpaque, sizeof(beacon2->RSNOpaque)); @@ -794,7 +794,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* EDCA Parameter set */ if (beacon2->EDCAParamSet.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_EDCA_PARAM_SET_EID); + WLAN_ELEMID_EDCAPARMS); qdf_mem_copy((void *)&prb_rsp->EDCAParamSet, (void *)&beacon2->EDCAParamSet, sizeof(beacon2->EDCAParamSet)); @@ -805,33 +805,33 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(struct mac_context *mac, /* HT capability IE */ if (beacon2->HTCaps.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_HT_CAPABILITIES_EID); + WLAN_ELEMID_HTCAP_ANA); qdf_mem_copy((void *)&prb_rsp->HTCaps, (void *)&beacon2->HTCaps, sizeof(beacon2->HTCaps)); } /* HT Info IE */ if (beacon2->HTInfo.present) { - set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_HT_INFO_EID); + set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, WLAN_ELEMID_HTINFO_ANA); qdf_mem_copy((void *)&prb_rsp->HTInfo, (void *)&beacon2->HTInfo, sizeof(beacon2->HTInfo)); } if (beacon2->VHTCaps.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_VHT_CAPABILITIES_EID); + WLAN_ELEMID_VHTCAP); qdf_mem_copy((void *)&prb_rsp->VHTCaps, (void *)&beacon2->VHTCaps, sizeof(beacon2->VHTCaps)); } if (beacon2->VHTOperation.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_VHT_OPERATION_EID); + WLAN_ELEMID_VHTOP); qdf_mem_copy((void *)&prb_rsp->VHTOperation, (void *)&beacon2->VHTOperation, sizeof(beacon2->VHTOperation)); } if (beacon2->VHTExtBssLoad.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, - SIR_MAC_VHT_EXT_BSS_LOAD_EID); + WLAN_ELEMID_EXT_BSS_LOAD); qdf_mem_copy((void *)&prb_rsp->VHTExtBssLoad, (void *)&beacon2->VHTExtBssLoad, sizeof(beacon2->VHTExtBssLoad)); @@ -986,7 +986,7 @@ void sch_generate_tim(struct mac_context *mac, uint8_t **pPtr, uint16_t *timLeng * field after host driver downloaded beacon template if end-user complaints * that DTIM count and bitmapControl is 0xFF. */ - *ptr++ = SIR_MAC_TIM_EID; + *ptr++ = WLAN_ELEMID_TIM; *ptr++ = (uint8_t) (*timLength); /* location for dtimCount. will be filled in by FW. */ *ptr++ = 0xFF; 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 747d5498b26c..4f2b4a8dc59e 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 @@ -516,7 +516,7 @@ populate_dot11f_ext_supp_rates(struct mac_context *mac, uint8_t nChannelNum, { QDF_STATUS nsir_status; qdf_size_t nRates = 0; - uint8_t rates[SIR_MAC_RATESET_EID_MAX]; + uint8_t rates[WLAN_SUPPORTED_RATES_IE_MAX_LEN]; /* Use the ext rates present in session entry whenever nChannelNum is set to OPERATIONAL else use the ext supported rate set from CFG, which is fixed and does not change dynamically and is used for @@ -3256,28 +3256,28 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, eseBcnReportMandatoryIe.fhParamPresent = 1; convert_fh_params(mac, &eseBcnReportMandatoryIe.fhParamSet, &pBies->FHParamSet); - numBytes += 1 + 1 + SIR_MAC_FH_PARAM_SET_EID_MAX; + numBytes += 1 + 1 + WLAN_FH_PARAM_IE_MAX_LEN; } if (pBies->DSParams.present) { eseBcnReportMandatoryIe.dsParamsPresent = 1; eseBcnReportMandatoryIe.dsParamSet.channelNumber = pBies->DSParams.curr_channel; - numBytes += 1 + 1 + SIR_MAC_DS_PARAM_SET_EID_MAX; + numBytes += 1 + 1 + WLAN_DS_PARAM_IE_MAX_LEN; } if (pBies->CFParams.present) { eseBcnReportMandatoryIe.cfPresent = 1; convert_cf_params(mac, &eseBcnReportMandatoryIe.cfParamSet, &pBies->CFParams); - numBytes += 1 + 1 + SIR_MAC_CF_PARAM_SET_EID_MAX; + numBytes += 1 + 1 + WLAN_CF_PARAM_IE_MAX_LEN; } if (pBies->IBSSParams.present) { eseBcnReportMandatoryIe.ibssParamPresent = 1; eseBcnReportMandatoryIe.ibssParamSet.atim = pBies->IBSSParams.atim; - numBytes += 1 + 1 + SIR_MAC_IBSS_PARAM_SET_EID_MAX; + numBytes += 1 + 1 + WLAN_IBSS_IE_MAX_LEN; } if (pBies->TIM.present) { @@ -3294,7 +3294,7 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, qdf_mem_copy(&eseBcnReportMandatoryIe.rmEnabledCapabilities, &pBies->RRMEnabledCap, sizeof(tDot11fIERRMEnabledCap)); - numBytes += 1 + 1 + SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX; + numBytes += 1 + 1 + WLAN_RM_CAPABILITY_IE_MAX_LEN; } *outIeBuf = qdf_mem_malloc(numBytes); @@ -3314,7 +3314,7 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, retStatus = QDF_STATUS_E_FAILURE; goto err_bcnrep; } - *pos = SIR_MAC_SSID_EID; + *pos = WLAN_ELEMID_SSID; pos++; *pos = eseBcnReportMandatoryIe.ssId.length; pos++; @@ -3334,8 +3334,8 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, goto err_bcnrep; } if (eseBcnReportMandatoryIe.supportedRates.numRates <= - SIR_MAC_RATESET_EID_MAX) { - *pos = SIR_MAC_RATESET_EID; + WLAN_SUPPORTED_RATES_IE_MAX_LEN) { + *pos = WLAN_ELEMID_RATES; pos++; *pos = eseBcnReportMandatoryIe.supportedRates.numRates; pos++; @@ -3352,72 +3352,72 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, /* Fill FH Parameter set IE */ if (eseBcnReportMandatoryIe.fhParamPresent) { - if (freeBytes < (1 + 1 + SIR_MAC_FH_PARAM_SET_EID_MAX)) { + if (freeBytes < (1 + 1 + WLAN_FH_PARAM_IE_MAX_LEN)) { pe_err("Insufficient memory to copy FHIE"); retStatus = QDF_STATUS_E_FAILURE; goto err_bcnrep; } - *pos = SIR_MAC_FH_PARAM_SET_EID; + *pos = WLAN_ELEMID_FHPARMS; pos++; - *pos = SIR_MAC_FH_PARAM_SET_EID_MAX; + *pos = WLAN_FH_PARAM_IE_MAX_LEN; pos++; qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe.fhParamSet, - SIR_MAC_FH_PARAM_SET_EID_MAX); - pos += SIR_MAC_FH_PARAM_SET_EID_MAX; - freeBytes -= (1 + 1 + SIR_MAC_FH_PARAM_SET_EID_MAX); + WLAN_FH_PARAM_IE_MAX_LEN); + pos += WLAN_FH_PARAM_IE_MAX_LEN; + freeBytes -= (1 + 1 + WLAN_FH_PARAM_IE_MAX_LEN); } /* Fill DS Parameter set IE */ if (eseBcnReportMandatoryIe.dsParamsPresent) { - if (freeBytes < (1 + 1 + SIR_MAC_DS_PARAM_SET_EID_MAX)) { + if (freeBytes < (1 + 1 + WLAN_DS_PARAM_IE_MAX_LEN)) { pe_err("Insufficient memory to copy DS IE"); retStatus = QDF_STATUS_E_FAILURE; goto err_bcnrep; } - *pos = SIR_MAC_DS_PARAM_SET_EID; + *pos = WLAN_ELEMID_DSPARMS; pos++; - *pos = SIR_MAC_DS_PARAM_SET_EID_MAX; + *pos = WLAN_DS_PARAM_IE_MAX_LEN; pos++; *pos = eseBcnReportMandatoryIe.dsParamSet.channelNumber; - pos += SIR_MAC_DS_PARAM_SET_EID_MAX; - freeBytes -= (1 + 1 + SIR_MAC_DS_PARAM_SET_EID_MAX); + pos += WLAN_DS_PARAM_IE_MAX_LEN; + freeBytes -= (1 + 1 + WLAN_DS_PARAM_IE_MAX_LEN); } /* Fill CF Parameter set */ if (eseBcnReportMandatoryIe.cfPresent) { - if (freeBytes < (1 + 1 + SIR_MAC_CF_PARAM_SET_EID_MAX)) { + if (freeBytes < (1 + 1 + WLAN_CF_PARAM_IE_MAX_LEN)) { pe_err("Insufficient memory to copy CF IE"); retStatus = QDF_STATUS_E_FAILURE; goto err_bcnrep; } - *pos = SIR_MAC_CF_PARAM_SET_EID; + *pos = WLAN_ELEMID_CFPARMS; pos++; - *pos = SIR_MAC_CF_PARAM_SET_EID_MAX; + *pos = WLAN_CF_PARAM_IE_MAX_LEN; pos++; qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe.cfParamSet, - SIR_MAC_CF_PARAM_SET_EID_MAX); - pos += SIR_MAC_CF_PARAM_SET_EID_MAX; - freeBytes -= (1 + 1 + SIR_MAC_CF_PARAM_SET_EID_MAX); + WLAN_CF_PARAM_IE_MAX_LEN); + pos += WLAN_CF_PARAM_IE_MAX_LEN; + freeBytes -= (1 + 1 + WLAN_CF_PARAM_IE_MAX_LEN); } /* Fill IBSS Parameter set IE */ if (eseBcnReportMandatoryIe.ibssParamPresent) { - if (freeBytes < (1 + 1 + SIR_MAC_IBSS_PARAM_SET_EID_MAX)) { + if (freeBytes < (1 + 1 + WLAN_IBSS_IE_MAX_LEN)) { pe_err("Insufficient memory to copy IBSS IE"); retStatus = QDF_STATUS_E_FAILURE; goto err_bcnrep; } - *pos = SIR_MAC_IBSS_PARAM_SET_EID; + *pos = WLAN_ELEMID_IBSSPARMS; pos++; - *pos = SIR_MAC_IBSS_PARAM_SET_EID_MAX; + *pos = WLAN_IBSS_IE_MAX_LEN; pos++; qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe.ibssParamSet. - atim, SIR_MAC_IBSS_PARAM_SET_EID_MAX); - pos += SIR_MAC_IBSS_PARAM_SET_EID_MAX; - freeBytes -= (1 + 1 + SIR_MAC_IBSS_PARAM_SET_EID_MAX); + atim, WLAN_IBSS_IE_MAX_LEN); + pos += WLAN_IBSS_IE_MAX_LEN; + freeBytes -= (1 + 1 + WLAN_IBSS_IE_MAX_LEN); } /* Fill TIM IE */ @@ -3427,7 +3427,7 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, retStatus = QDF_STATUS_E_FAILURE; goto err_bcnrep; } - *pos = SIR_MAC_TIM_EID; + *pos = WLAN_ELEMID_TIM; pos++; *pos = SIR_MAC_TIM_EID_MIN; pos++; @@ -3440,20 +3440,20 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, /* Fill RM Capability IE */ if (eseBcnReportMandatoryIe.rrmPresent) { - if (freeBytes < (1 + 1 + SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX)) { + if (freeBytes < (1 + 1 + WLAN_RM_CAPABILITY_IE_MAX_LEN)) { pe_err("Insufficient memory to copy RRM IE"); retStatus = QDF_STATUS_E_FAILURE; goto err_bcnrep; } - *pos = SIR_MAC_RM_ENABLED_CAPABILITY_EID; + *pos = WLAN_ELEMID_RRM; pos++; - *pos = SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX; + *pos = WLAN_RM_CAPABILITY_IE_MAX_LEN; pos++; qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe. rmEnabledCapabilities, - SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX); - freeBytes -= (1 + 1 + SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX); + WLAN_RM_CAPABILITY_IE_MAX_LEN); + freeBytes -= (1 + 1 + WLAN_RM_CAPABILITY_IE_MAX_LEN); } if (freeBytes != 0) { @@ -4241,7 +4241,7 @@ sir_convert_auth_frame2_struct(struct mac_context *mac, pAuth->authStatusCode = auth.Status.status; if (auth.ChallengeText.present) { - pAuth->type = SIR_MAC_CHALLENGE_TEXT_EID; + pAuth->type = WLAN_ELEMID_CHALLENGE; pAuth->length = auth.ChallengeText.num_text; qdf_mem_copy(pAuth->challengeText, auth.ChallengeText.text, auth.ChallengeText.num_text); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 65f0e0ce9a80..5cb994b41a39 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -4548,7 +4548,7 @@ static void csr_set_cfg_rate_set(struct mac_context *mac, eCsrPhyMode phyMode, static void csr_set_cfg_rate_set_from_profile(struct mac_context *mac, struct csr_roam_profile *pProfile) { - tSirMacRateSetIE DefaultSupportedRates11a = { SIR_MAC_RATESET_EID, + tSirMacRateSetIE DefaultSupportedRates11a = { WLAN_ELEMID_RATES, {8, {SIR_MAC_RATE_6, SIR_MAC_RATE_9, @@ -4558,7 +4558,7 @@ static void csr_set_cfg_rate_set_from_profile(struct mac_context *mac, SIR_MAC_RATE_36, SIR_MAC_RATE_48, SIR_MAC_RATE_54} } }; - tSirMacRateSetIE DefaultSupportedRates11b = { SIR_MAC_RATESET_EID, + tSirMacRateSetIE DefaultSupportedRates11b = { WLAN_ELEMID_RATES, {4, {SIR_MAC_RATE_1, SIR_MAC_RATE_2, @@ -11184,7 +11184,7 @@ csr_roam_chk_lnk_assoc_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr) if (!QDF_IS_STATUS_SUCCESS(status)) { /* Refused due to Mac filtering */ roam_info->statusCode = eSIR_SME_ASSOC_REFUSED; - } else if (pAssocInd->rsnIE.length && SIR_MAC_RSN_EID == + } else if (pAssocInd->rsnIE.length && WLAN_ELEMID_RSN == pAssocInd->rsnIE.rsnIEdata[0]) { tDot11fIERSN rsn_ie = {0}; @@ -13644,11 +13644,13 @@ static void csr_populate_supported_rates_from_hostapd(tSirMacRateSet *opr_rates, profile->supported_rates.numRates, profile->extended_rates.numRates); - if (profile->supported_rates.numRates > SIR_MAC_RATESET_EID_MAX) - profile->supported_rates.numRates = SIR_MAC_RATESET_EID_MAX; + if (profile->supported_rates.numRates > WLAN_SUPPORTED_RATES_IE_MAX_LEN) + profile->supported_rates.numRates = + WLAN_SUPPORTED_RATES_IE_MAX_LEN; - if (profile->extended_rates.numRates > SIR_MAC_RATESET_EID_MAX) - profile->extended_rates.numRates = SIR_MAC_RATESET_EID_MAX; + if (profile->extended_rates.numRates > WLAN_SUPPORTED_RATES_IE_MAX_LEN) + profile->extended_rates.numRates = + WLAN_SUPPORTED_RATES_IE_MAX_LEN; if (profile->supported_rates.numRates) { opr_rates->numRates = profile->supported_rates.numRates; @@ -13827,11 +13829,12 @@ csr_roam_get_bss_start_parms_from_bss_desc( if (pIes->SuppRates.present) { pParam->operationalRateSet.numRates = pIes->SuppRates.num_rates; - if (pIes->SuppRates.num_rates > SIR_MAC_RATESET_EID_MAX) { + if (pIes->SuppRates.num_rates > WLAN_SUPPORTED_RATES_IE_MAX_LEN) { sme_err( "num_rates: %d > max val, resetting", pIes->SuppRates.num_rates); - pIes->SuppRates.num_rates = SIR_MAC_RATESET_EID_MAX; + pIes->SuppRates.num_rates = + WLAN_SUPPORTED_RATES_IE_MAX_LEN; } qdf_mem_copy(pParam->operationalRateSet.rate, pIes->SuppRates.rates, @@ -13840,11 +13843,12 @@ csr_roam_get_bss_start_parms_from_bss_desc( } if (pIes->ExtSuppRates.present) { pParam->extendedRateSet.numRates = pIes->ExtSuppRates.num_rates; - if (pIes->ExtSuppRates.num_rates > SIR_MAC_RATESET_EID_MAX) { + if (pIes->ExtSuppRates.num_rates > WLAN_SUPPORTED_RATES_IE_MAX_LEN) { sme_err( "num_rates: %d > max val, resetting", pIes->ExtSuppRates.num_rates); - pIes->ExtSuppRates.num_rates = SIR_MAC_RATESET_EID_MAX; + pIes->ExtSuppRates.num_rates = + WLAN_SUPPORTED_RATES_IE_MAX_LEN; } qdf_mem_copy(pParam->extendedRateSet.rate, pIes->ExtSuppRates.rates, @@ -14837,7 +14841,7 @@ void csr_dump_vendor_ies(uint8_t *ie, uint16_t ie_len) elem_id, elem_len, left); return; } - if (elem_id == SIR_MAC_EID_VENDOR) { + if (elem_id == WLAN_ELEMID_VENDOR) { sme_debug("Dumping Vendor IE of len %d", elem_len); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 47cb971c36ea..d36d07405d6f 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -3978,7 +3978,7 @@ uint8_t csr_construct_rsn_ie(struct mac_context *mac, uint32_t sessionId, if (!fRSNMatch) break; - pRSNIe->IeHeader.ElementID = SIR_MAC_RSN_EID; + pRSNIe->IeHeader.ElementID = WLAN_ELEMID_RSN; pRSNIe->Version = CSR_RSN_VERSION_SUPPORTED;