diff --git a/core/cds/inc/cds_ieee80211_common.h b/core/cds/inc/cds_ieee80211_common.h index 049b82f36f..cec030be0b 100644 --- a/core/cds/inc/cds_ieee80211_common.h +++ b/core/cds/inc/cds_ieee80211_common.h @@ -185,79 +185,6 @@ struct ieee80211_htc { #define IEEE80211_HTCAP_MAXRXAMPDU_FACTOR 13 -/* - * Management information element payloads. - */ -enum { - IEEE80211_ELEMID_SSID = 0, - IEEE80211_ELEMID_RATES = 1, - IEEE80211_ELEMID_FHPARMS = 2, - IEEE80211_ELEMID_DSPARMS = 3, - IEEE80211_ELEMID_CFPARMS = 4, - IEEE80211_ELEMID_TIM = 5, - IEEE80211_ELEMID_IBSSPARMS = 6, - IEEE80211_ELEMID_COUNTRY = 7, - IEEE80211_ELEMID_REQINFO = 10, - IEEE80211_ELEMID_QBSS_LOAD = 11, - IEEE80211_ELEMID_TCLAS = 14, - IEEE80211_ELEMID_CHALLENGE = 16, - /* 17-31 reserved for challenge text extension */ - IEEE80211_ELEMID_PWRCNSTR = 32, - IEEE80211_ELEMID_PWRCAP = 33, - IEEE80211_ELEMID_TPCREQ = 34, - IEEE80211_ELEMID_TPCREP = 35, - IEEE80211_ELEMID_SUPPCHAN = 36, - IEEE80211_ELEMID_CHANSWITCHANN = 37, - IEEE80211_ELEMID_MEASREQ = 38, - IEEE80211_ELEMID_MEASREP = 39, - IEEE80211_ELEMID_QUIET = 40, - IEEE80211_ELEMID_IBSSDFS = 41, - IEEE80211_ELEMID_ERP = 42, - IEEE80211_ELEMID_TCLAS_PROCESS = 44, - IEEE80211_ELEMID_HTCAP_ANA = 45, - IEEE80211_ELEMID_RESERVED_47 = 47, - IEEE80211_ELEMID_RSN = 48, - IEEE80211_ELEMID_XRATES = 50, - IEEE80211_ELEMID_HTCAP = 51, - IEEE80211_ELEMID_HTINFO = 52, - IEEE80211_ELEMID_MOBILITY_DOMAIN = 54, - IEEE80211_ELEMID_FT = 55, - IEEE80211_ELEMID_TIMEOUT_INTERVAL = 56, - IEEE80211_ELEMID_EXTCHANSWITCHANN = 60, - IEEE80211_ELEMID_HTINFO_ANA = 61, - IEEE80211_ELEMID_SECCHANOFFSET = 62, - IEEE80211_ELEMID_WAPI = 68, /*IE for WAPI */ - IEEE80211_ELEMID_TIME_ADVERTISEMENT = 69, - IEEE80211_ELEMID_RRM = 70, /* Radio resource measurement */ - IEEE80211_ELEMID_2040_COEXT = 72, - IEEE80211_ELEMID_2040_INTOL = 73, - IEEE80211_ELEMID_OBSS_SCAN = 74, - IEEE80211_ELEMID_MMIE = 76, /* 802.11w Management MIC IE */ - IEEE80211_ELEMID_FMS_DESCRIPTOR = 86, /* 802.11v FMS descriptor IE */ - IEEE80211_ELEMID_FMS_REQUEST = 87, /* 802.11v FMS request IE */ - IEEE80211_ELEMID_FMS_RESPONSE = 88, /* 802.11v FMS response IE */ - IEEE80211_ELEMID_BSSMAX_IDLE_PERIOD = 90, /* BSS MAX IDLE PERIOD */ - IEEE80211_ELEMID_TFS_REQUEST = 91, - IEEE80211_ELEMID_TFS_RESPONSE = 92, - IEEE80211_ELEMID_TIM_BCAST_REQUEST = 94, - IEEE80211_ELEMID_TIM_BCAST_RESPONSE = 95, - IEEE80211_ELEMID_INTERWORKING = 107, - IEEE80211_ELEMID_XCAPS = 127, - IEEE80211_ELEMID_RESERVED_133 = 133, - IEEE80211_ELEMID_TPC = 150, - IEEE80211_ELEMID_CCKM = 156, - IEEE80211_ELEMID_VHTCAP = 191, /* VHT Capabilities */ - IEEE80211_ELEMID_VHTOP = 192, /* VHT Operation */ - IEEE80211_ELEMID_EXT_BSS_LOAD = 193, /* Extended BSS Load */ - IEEE80211_ELEMID_WIDE_BAND_CHAN_SWITCH = 194, /* Wide Band Channel Switch */ - IEEE80211_ELEMID_VHT_TX_PWR_ENVLP = 195, /* VHT Transmit Power Envelope */ - IEEE80211_ELEMID_CHAN_SWITCH_WRAP = 196, /* Channel Switch Wrapper */ - IEEE80211_ELEMID_AID = 197, /* AID */ - IEEE80211_ELEMID_QUIET_CHANNEL = 198, /* Quiet Channel */ - IEEE80211_ELEMID_OP_MODE_NOTIFY = 199, /* Operating Mode Notification */ - IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ -}; - struct ieee80211_channelswitch_ie { uint8_t ie; /* IEEE80211_ELEMID_CHANSWITCHANN */ uint8_t len; diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index 0631118ef9..ad2ec30a28 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2019 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 @@ -269,7 +269,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, mmie = (struct ieee80211_mmie *)(efrm - sizeof(*mmie)); /* Copy Element id */ - mmie->element_id = IEEE80211_ELEMID_MMIE; + mmie->element_id = WLAN_ELEMID_MMIE; /* Copy Length */ mmie->length = sizeof(*mmie) - 2; @@ -372,7 +372,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) mmie = (struct ieee80211_mmie *)(efrm - sizeof(*mmie)); /* Check Element ID */ - if ((mmie->element_id != IEEE80211_ELEMID_MMIE) || + if ((mmie->element_id != WLAN_ELEMID_MMIE) || (mmie->length != (sizeof(*mmie) - 2))) { cds_err("IE is not Mgmt MIC IE or Invalid length"); /* IE is not Mgmt MIC IE or invalid length */ @@ -511,7 +511,7 @@ bool cds_is_gmac_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, mmie = (struct ieee80211_mmie_16 *)(efrm - sizeof(*mmie)); /* Check Element ID */ - if ((mmie->element_id != IEEE80211_ELEMID_MMIE) || + if ((mmie->element_id != WLAN_ELEMID_MMIE) || (mmie->length != (sizeof(*mmie) - 2))) { cds_err("IE is not Mgmt MIC IE or Invalid length"); /* IE is not Mgmt MIC IE or invalid length */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 82dd8b5355..059ef2922f 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -18435,7 +18435,7 @@ static void ese_populate_addtional_ies(struct mac_context *mac_ctx, ese_populate_wmm_tspec(&ese_tspec.tspec[j].tspec, tspec_ie); csr_append_assoc_ies(mac_ctx, req_buf, - IEEE80211_ELEMID_VENDOR, + WLAN_ELEMID_VENDOR, DOT11F_IE_WMMTSPEC_MAX_LEN, tspec_ie_buf); } @@ -18494,7 +18494,7 @@ static void csr_update_driver_assoc_ies(struct mac_context *mac_ctx, if (csr_11henable && csr_is11h_supported(mac_ctx)) { /* Append power cap IE */ - csr_append_assoc_ies(mac_ctx, req_buf, IEEE80211_ELEMID_PWRCAP, + csr_append_assoc_ies(mac_ctx, req_buf, WLAN_ELEMID_PWRCAP, DOT11F_IE_POWERCAPS_MAX_LEN, power_cap_ie_data); power_caps_populated = true; @@ -18504,27 +18504,27 @@ static void csr_update_driver_assoc_ies(struct mac_context *mac_ctx, &supp_chan_ie_len, true); csr_append_assoc_ies(mac_ctx, req_buf, - IEEE80211_ELEMID_SUPPCHAN, + WLAN_ELEMID_SUPPCHAN, supp_chan_ie_len, supp_chan_ie); } #ifdef FEATURE_WLAN_ESE /* Append ESE version IE if isEseIniFeatureEnabled INI is enabled */ if (mac_ctx->mlme_cfg->lfr.ese_enabled) - csr_append_assoc_ies(mac_ctx, req_buf, IEEE80211_ELEMID_VENDOR, + csr_append_assoc_ies(mac_ctx, req_buf, WLAN_ELEMID_VENDOR, DOT11F_IE_ESEVERSION_MAX_LEN, ese_ie); #endif if (mac_ctx->rrm.rrmPEContext.rrmEnable) { /* Append RRM IE */ - csr_append_assoc_ies(mac_ctx, req_buf, IEEE80211_ELEMID_RRM, + csr_append_assoc_ies(mac_ctx, req_buf, WLAN_ELEMID_RRM, DOT11F_IE_RRMENABLEDCAP_MAX_LEN, rrm_cap_ie_data); if (!power_caps_populated) /* Append Power cap IE if not appended already */ csr_append_assoc_ies(mac_ctx, req_buf, - IEEE80211_ELEMID_PWRCAP, + WLAN_ELEMID_PWRCAP, DOT11F_IE_POWERCAPS_MAX_LEN, power_cap_ie_data); } @@ -18532,7 +18532,7 @@ static void csr_update_driver_assoc_ies(struct mac_context *mac_ctx, /* Append QCN IE if g_support_qcn_ie INI is enabled */ if (mac_ctx->mlme_cfg->sta.qcn_ie_support) - csr_append_assoc_ies(mac_ctx, req_buf, IEEE80211_ELEMID_VENDOR, + csr_append_assoc_ies(mac_ctx, req_buf, WLAN_ELEMID_VENDOR, DOT11F_IE_QCN_IE_MAX_LEN, qcn_ie); }