diff --git a/core/mac/inc/ani_system_defs.h b/core/mac/inc/ani_system_defs.h index 42544d646dcb..74e0d0692829 100644 --- a/core/mac/inc/ani_system_defs.h +++ b/core/mac/inc/ani_system_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-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 @@ -109,11 +109,6 @@ typedef struct sAniSSID { uint8_t ssId[SIR_MAC_MAX_SSID_LENGTH]; } tAniSSID, *tpAniSSID; -typedef struct sAniApName { - uint8_t length; - uint8_t name[SIR_MAC_MAX_SSID_LENGTH]; -} tAniApName, *tpAniApName; - /* / RSN IE information */ typedef struct sSirRSNie { uint16_t length; diff --git a/core/mac/inc/sir_mac_prop_exts.h b/core/mac/inc/sir_mac_prop_exts.h index 86f9b3e7efa2..2b27cf9c362f 100644 --- a/core/mac/inc/sir_mac_prop_exts.h +++ b/core/mac/inc/sir_mac_prop_exts.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015, 2017-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2015, 2017-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 @@ -69,38 +69,4 @@ #define WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ 2 #define WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ 3 -typedef struct sSirMacPropRateSet { - uint8_t numPropRates; - uint8_t propRate[8]; -} tSirMacPropRateSet, *tpSirMacPropRateSet; - -#define SIR_PROP_VERSION_STR_MAX 20 -typedef struct sSirMacPropVersion { - uint32_t chip_rev; /* board, chipset info */ - uint8_t card_type; /* Type of Card */ - /* build version string */ - uint8_t build_version[SIR_PROP_VERSION_STR_MAX]; -} tSirMacPropVersion, *tpSirMacPropVersion; - -/* generic proprietary IE structure definition */ -typedef struct sSirPropIEStruct { - uint8_t propRatesPresent:1; - uint8_t apNamePresent:1; - uint8_t loadBalanceInfoPresent:1; - uint8_t versionPresent:1; - uint8_t edcaParamPresent:1; - uint8_t capabilityPresent:1; - uint8_t propChannelSwitchPresent:1; - uint8_t triggerStaScanPresent:1; - uint8_t rsvd:8; - - tSirMacPropRateSet propRates; - tAniApName apName; /* used in beacon/probe only */ - uint16_t capability; /* capability bit map */ - tSirMacPropVersion version; - tSirMacEdcaParamSetIE edca; - uint8_t triggerStaScanEnable; - -} tSirPropIEStruct, *tpSirPropIEStruct; - #endif /* __MAC_PROP_EXTS_H */ diff --git a/core/mac/src/include/dph_global.h b/core/mac/src/include/dph_global.h index 00e55261f614..9a0023882efe 100644 --- a/core/mac/src/include/dph_global.h +++ b/core/mac/src/include/dph_global.h @@ -39,7 +39,6 @@ #include "lim_global.h" #include "sir_mac_prot_def.h" -#include "sir_mac_prop_exts.h" #include "sir_api.h" /* Following determines whether statistics are maintained or not */ @@ -117,8 +116,6 @@ typedef struct sDphHashNode { /* BYTE 2 */ /* set if both ap and sta are wsm capable */ uint8_t wsmEnabled:1; - /* station gave version info */ - uint8_t versionPresent:1; uint8_t staAuthenticated:1; uint8_t fAniCount:1; uint8_t rmfEnabled:1; @@ -134,8 +131,6 @@ typedef struct sDphHashNode { uint32_t curTxMpduCnt; /* qos parameter info */ tDphQosParams qos; - /* station version info - valid only if versionPresent is set */ - tSirMacPropVersion version; #ifdef PLM_WDS uint8_t wdsIndex; uint8_t wdsPeerBeaconSeen; diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 90e6fcc997dd..d83c23a18588 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-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 @@ -213,7 +213,6 @@ typedef struct sSirProbeRespBeacon { tSirMacErpInfo erpIEInfo; - tSirPropIEStruct propIEinfo; tDot11fIEPowerConstraints localPowerConstraint; tDot11fIETPCReport tpcReport; tDot11fIEChanSwitchAnn channelSwitchIE; @@ -326,7 +325,6 @@ typedef struct sSirAssocReq { tSirMacRsnInfo rsn; tSirAddie addIE; - tSirPropIEStruct propIEinfo; tSirMacPowerCapabilityIE powerCapability; tSirMacSupportedChannelIE supportedChannels; tDot11fIEHTCaps HTCaps; @@ -370,7 +368,6 @@ typedef struct sSirAssocRsp { uint16_t statusCode; tSirMacRateSet supportedRates; tSirMacRateSet extendedRates; - tSirPropIEStruct propIEinfo; tSirMacEdcaParamSetIE edca; tSirAddtsRspInfo addtsRsp; tDot11fIEHTCaps HTCaps; @@ -537,8 +534,6 @@ struct s_ext_cap { uint8_t twt_responder_support:1; }; -uint8_t sirIsPropCapabilityEnabled(struct mac_context *mac, uint32_t bitnum); - #define CFG_GET_INT(nStatus, mac, nItem, cfg) do { \ (nStatus) = wlan_cfg_get_int((mac), (nItem), &(cfg)); \ if (QDF_STATUS_SUCCESS != (nStatus)) { \ diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 16c296d303c1..e5f5d0cdf249 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -233,7 +233,6 @@ typedef struct sLimMlmStaContext { tSirResultCodes resultCode; - tSirMacPropRateSet propRateSet; uint8_t subType:1; /* Indicates ASSOC (0) or REASSOC (1) */ uint8_t updateContext:1; uint8_t schClean:1; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index e10f0eaaee9f..fa33fe77c03b 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-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 @@ -165,7 +165,6 @@ struct pe_session { tAniAuthType limCurrentAuthType; uint16_t limCurrentBssCaps; uint8_t limCurrentBssQosCaps; - uint16_t limCurrentBssPropCap; uint8_t limSentCapsChangeNtf; uint16_t limAID; @@ -179,7 +178,6 @@ struct pe_session { tSirMacSSid limReassocSSID; uint16_t limReassocBssCaps; uint8_t limReassocBssQosCaps; - uint16_t limReassocBssPropCap; /* Assoc or ReAssoc Response Data/Frame */ void *limAssocResponseData; diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 28dfcca22b8e..4a32f0942b78 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -665,13 +665,11 @@ void lim_fill_ft_session(struct mac_context *mac, lim_extract_ap_capability(mac, (uint8_t *) pbssDescription->ieFields, lim_get_ielen_from_bss_description(pbssDescription), &ft_session->limCurrentBssQosCaps, - &ft_session->limCurrentBssPropCap, ¤tBssUapsd, + ¤tBssUapsd, &localPowerConstraint, ft_session); ft_session->limReassocBssQosCaps = ft_session->limCurrentBssQosCaps; - ft_session->limReassocBssPropCap = - ft_session->limCurrentBssPropCap; ft_session->is11Rconnection = pe_session->is11Rconnection; #ifdef FEATURE_WLAN_ESE 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 e87f65483a56..3246b299ce4b 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 @@ -1403,7 +1403,6 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr, (assoc_req->addtsPresent == 0) ? false : true; sta_ds->qos.addts = assoc_req->addtsReq; sta_ds->qos.capability = assoc_req->qosCapability; - sta_ds->versionPresent = 0; /* * short slot and short preamble should be updated before doing * limaddsta 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 1b7a652e4663..ac7da6e71865 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 @@ -1641,7 +1641,6 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, uint32_t *msg_buf) lim_get_ielen_from_bss_description( &session->pLimJoinReq->bssDescription), &session->limCurrentBssQosCaps, - &session->limCurrentBssPropCap, &session->gLimCurrentBssUapsd, &local_power_constraint, session); @@ -1958,7 +1957,6 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx, lim_get_ielen_from_bss_description( &session_entry->pLimReAssocReq->bssDescription), &session_entry->limReassocBssQosCaps, - &session_entry->limReassocBssPropCap, &session_entry->gLimCurrentBssUapsd, &local_pwr_constraint, session_entry); session_entry->maxTxPower = QDF_MIN(reg_max, (local_pwr_constraint)); diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 2c32d54ea29f..6e090baa9e5a 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-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 @@ -176,26 +176,11 @@ static void lim_objmgr_update_vdev_nss(struct wlan_objmgr_psoc *psoc, wlan_vdev_obj_unlock(vdev); wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID); } -/** - * lim_extract_ap_capability() - extract AP's HCF/WME/WSM capability - * @mac_ctx: Pointer to Global MAC structure - * @p_ie: Pointer to starting IE in Beacon/Probe Response - * @ie_len: Length of all IEs combined - * @qos_cap: Bits are set according to capabilities - * @prop_cap: Pointer to prop info IE. - * @uapsd: pointer to uapsd - * @local_constraint: Pointer to local power constraint. - * @session: A pointer to session entry. - * - * This function is called to extract AP's HCF/WME/WSM capability - * from the IEs received from it in Beacon/Probe Response frames - * - * Return: None - */ + void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie, - uint16_t ie_len, uint8_t *qos_cap, uint16_t *prop_cap, uint8_t *uapsd, - int8_t *local_constraint, struct pe_session *session) + uint16_t ie_len, uint8_t *qos_cap, uint8_t *uapsd, + int8_t *local_constraint, struct pe_session *session) { tSirProbeRespBeacon *beacon_struct; uint8_t ap_bcon_ch_width; @@ -211,7 +196,6 @@ lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie, return; *qos_cap = 0; - *prop_cap = 0; *uapsd = 0; pe_debug("The IE's being received:"); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, @@ -230,8 +214,6 @@ lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie, if (LIM_BSS_CAPS_GET(WME, *qos_cap) && beacon_struct->wsmCapablePresent) LIM_BSS_CAPS_SET(WSM, *qos_cap); - if (beacon_struct->propIEinfo.capabilityPresent) - *prop_cap = beacon_struct->propIEinfo.capability; if (beacon_struct->HTCaps.present) mac_ctx->lim.htCapabilityPresentInBeacon = 1; else diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.h b/core/mac/src/pe/lim/lim_prop_exts_utils.h index 03ad03824aee..6f49b8f36b86 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.h +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014, 2016, 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, 2016, 2018-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 @@ -31,21 +31,25 @@ #ifndef __LIM_PROP_EXTS_UTILS_H #define __LIM_PROP_EXTS_UTILS_H -/* Function templates */ -void limQuietBss(struct mac_context *, uint32_t); -void lim_cleanupMeasData(struct mac_context *); -void limDeleteMeasTimers(struct mac_context *); -void limStopMeasTimers(struct mac_context *mac); -void lim_cleanupMeasResources(struct mac_context *); -void limRestorePreLearnState(struct mac_context *); -void limCollectMeasurementData(struct mac_context *, uint32_t *, tpSchBeaconStruct); -void limCollectRSSI(struct mac_context *); -void limDeleteCurrentBssWdsNode(struct mac_context *); -uint32_t limComputeAvg(struct mac_context *, uint32_t, uint32_t); - -/* / Function to extract AP's HCF capability from IE fields */ -void lim_extract_ap_capability(struct mac_context *, uint8_t *, uint16_t, uint8_t *, - uint16_t *, uint8_t *, int8_t *, struct pe_session *); +/** + * lim_extract_ap_capability() - extract AP's HCF/WME/WSM capability + * @mac_ctx: Pointer to Global MAC structure + * @p_ie: Pointer to starting IE in Beacon/Probe Response + * @ie_len: Length of all IEs combined + * @qos_cap: Bits are set according to capabilities + * @uapsd: pointer to uapsd + * @local_constraint: Pointer to local power constraint. + * @session: A pointer to session entry. + * + * This function is called to extract AP's HCF/WME/WSM capability + * from the IEs received from it in Beacon/Probe Response frames + * + * Return: None + */ +void +lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie, + uint16_t ie_len, uint8_t *qos_cap, uint8_t *uapsd, + int8_t *local_constraint, struct pe_session *session); ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode); diff --git a/core/mac/src/pe/lim/lim_reassoc_utils.c b/core/mac/src/pe/lim/lim_reassoc_utils.c index a083a7f48f3d..00ee06bdf19a 100644 --- a/core/mac/src/pe/lim/lim_reassoc_utils.c +++ b/core/mac/src/pe/lim/lim_reassoc_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-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 @@ -74,8 +74,6 @@ void lim_update_re_assoc_globals(struct mac_context *mac, tpSirAssocRsp pAssocRs pe_session->limCurrentBssCaps = pe_session->limReassocBssCaps; pe_session->limCurrentBssQosCaps = pe_session->limReassocBssQosCaps; - pe_session->limCurrentBssPropCap = - pe_session->limReassocBssPropCap; qdf_mem_copy((uint8_t *) &pe_session->ssId, (uint8_t *) &pe_session->limReassocSSID,