From 062d054549486401b6ea9d7be3593f1e5863e768 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Tue, 1 Mar 2016 17:56:11 -0800 Subject: [PATCH] qcacld-3.0: Update dot11f.frms for new radio measurement types Update dot11f.frms to decode LCI and Fine Time Measurement in incoming Radio Measurement frames. Currently we do not have these new types supported leading to incorrect frame parsing. Adding these types make sure that incoming radio measurement request frames are unpacked correctly. Change-Id: I542bb2b782fed144702c372cbfc314c666c72f53 CRs-Fixed: 980863 --- core/mac/src/cfg/cfgUtil/dot11f.frms | 253 +- core/mac/src/include/dot11f.h | 383 ++- .../mac/src/sys/legacy/src/utils/src/dot11f.c | 2705 ++++++++++------- 3 files changed, 2114 insertions(+), 1227 deletions(-) diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms index 5f50801751f5..91b3b1d5c542 100644 --- a/core/mac/src/cfg/cfgUtil/dot11f.frms +++ b/core/mac/src/cfg/cfgUtil/dot11f.frms @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2007, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2006-2007, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1469,80 +1469,6 @@ IE TCLAS (EID_TCLAS) // 7.3.2.31 }; } // End IE TCLASS -const EID_RRM_BEACON_REPORTING = 1; -const EID_RRM_BCN_REPORTING_DETAIL = 2; - -IE BeaconReporting (EID_RRM_BEACON_REPORTING) -{ - reportingCondition, 1; - threshold, 1; -} - -IE BcnReportingDetail (EID_RRM_BCN_REPORTING_DETAIL) -{ - reportingDetail, 1; -} - -IE APChannelReport (EID_AP_CHAN_REPORT) -{ - regulatoryClass, 1; - channelList[0..50]; -} - -IE MeasurementRequest (EID_MEAS_REQUEST) // 7.3.2.21 -{ - measurement_token, 1; - - // Measurement Request Mode - { - parallel: 1; - enable: 1; - request: 1; - report: 1; - durationMandatory: 1; - unused: 3; - } - - measurement_type, 1; - UNION measurement_request (DISCRIMINATOR measurement_type) - { - Basic (measurement_type IS 0) - { - channel_no, 1; - meas_start_time[8]; - meas_duration, 2; - } - CCA (measurement_type IS 1) - { - channel_no, 1; - meas_start_time[8]; - meas_duration, 2; - } - RPIHistogram (measurement_type IS 2) - { - channel_no, 1; - meas_start_time[8]; - meas_duration, 2; - } - Beacon (measurement_type IS 5) - { - regClass, 1; - channel, 1; - randomization, 2; - meas_duration, 2; - meas_mode, 1; - BSSID[6]; - OPTIE SSID; - OPTIE BeaconReporting; - OPTIE BcnReportingDetail; - OPTIE RequestedInfo; - OPTIE APChannelReport[0..2]; - //OPTIONAL vendor_specific[1..239]; - } - - }; -} - const EID_BCN_REPORT_FRAME_BODY = 1; IE BeaconReportFrmBody (EID_BCN_REPORT_FRAME_BODY) { @@ -2059,7 +1985,16 @@ IE ht2040_bss_intolerant_report (EID_20_40_BSS_INTOLERANT_REPORT) const EID_RRM_NBR_RPT_TSF = 1; const EID_RRM_NBR_CD_COUNTRY = 2; -const EID_RRM_NBR_MSMT_PILOT_TX_INFO = 66; + +IE TSFInfo (EID_RRM_NBR_RPT_TSF) +{ + TsfOffset, 2; + BeaconIntvl, 2; +} +IE CondensedCountryStr (EID_RRM_NBR_CD_COUNTRY) +{ + countryStr[2]; +} IE NeighborReport (EID_NEIGHBOR_REPORT) { @@ -2089,20 +2024,9 @@ IE NeighborReport (EID_NEIGHBOR_REPORT) regulatoryClass, 1; channel, 1; PhyType, 1; - OPTIE IE TSFInfo (EID_RRM_NBR_RPT_TSF) - { - TsfOffset, 2; - BeaconIntvl, 2; - } - OPTIE IE CondensedCountryStr (EID_RRM_NBR_CD_COUNTRY) - { - countryStr[2]; - } - OPTIE IE MeasurementPilot; // (EID_RRM_NBR_MSMT_PILOT_TX_INFO) -// { -// measurementPilot, 1; -// vendorSpecific[0..255]; //Should be an IE. But currently only one level of nesting allowed. Can ignore for now. -// } + OPTIE IE TSFInfo; + OPTIE IE CondensedCountryStr; + OPTIE IE MeasurementPilot; OPTIE IE RRMEnabledCap; OPTIE IE MultiBssid; //Ignoring vendor specific. @@ -2466,6 +2390,155 @@ IE TimeAdvertisement (EID_TIME_ADVERTISEMENT) // 8.4.2.63 time_error[5]; } +const EID_RRM_BEACON_REPORTING = 1; +const EID_RRM_BCN_REPORTING_DETAIL = 2; + +const SUB_EID_AZIMUTH_REQ = 1; +const SUB_EID_REQ_MAC_ADDR = 2; +const SUB_EID_TGT_MAC_ADDR = 3; +const SUB_EID_MAX_AGE = 4; +const SUB_EID_NEIGHBOR_RPT = 52; + +IE BeaconReporting (EID_RRM_BEACON_REPORTING) +{ + reportingCondition, 1; + threshold, 1; +} + +IE BcnReportingDetail (EID_RRM_BCN_REPORTING_DETAIL) +{ + reportingDetail, 1; +} + +IE APChannelReport (EID_AP_CHAN_REPORT) +{ + regulatoryClass, 1; + channelList[0..50]; +} + +IE azimuth_req (SUB_EID_AZIMUTH_REQ) +{ + request, 1; +} + +IE req_mac_addr (SUB_EID_REQ_MAC_ADDR) +{ + addr[6]; +} + +IE tgt_mac_addr (SUB_EID_TGT_MAC_ADDR) +{ + addr[6]; +} + +IE max_age (SUB_EID_MAX_AGE) +{ + max_age, 2; +} + +IE neighbor_rpt (SUB_EID_NEIGHBOR_RPT) +{ + bssid[6]; + //Bssid Info + { + APReachability: 2; + Security: 1; + KeyScope: 1; + //Capabilities + SpecMgmtCap: 1; + QosCap: 1; + apsd: 1; + rrm: 1; + } + //Capabilities contd. + { + DelayedBA: 1; + ImmBA: 1; + //Capabilities end. + MobilityDomain: 1; + reserved: 5; + } + reserved1, 2; //part of BSSID Info. + regulatoryClass, 1; + channel, 1; + PhyType, 1; + OPTIE IE TSFInfo; + OPTIE IE CondensedCountryStr; + OPTIE IE MeasurementPilot; + OPTIE IE RRMEnabledCap; + OPTIE IE MultiBssid; +} + +IE MeasurementRequest (EID_MEAS_REQUEST) // 7.3.2.21 +{ + measurement_token, 1; + + // Measurement Request Mode + { + parallel: 1; + enable: 1; + request: 1; + report: 1; + durationMandatory: 1; + unused: 3; + } + + measurement_type, 1; + UNION measurement_request (DISCRIMINATOR measurement_type) + { + Basic (measurement_type IS 0) + { + channel_no, 1; + meas_start_time[8]; + meas_duration, 2; + } + CCA (measurement_type IS 1) + { + channel_no, 1; + meas_start_time[8]; + meas_duration, 2; + } + RPIHistogram (measurement_type IS 2) + { + channel_no, 1; + meas_start_time[8]; + meas_duration, 2; + } + Beacon (measurement_type IS 5) + { + regClass, 1; + channel, 1; + randomization, 2; + meas_duration, 2; + meas_mode, 1; + BSSID[6]; + OPTIE SSID; + OPTIE BeaconReporting; + OPTIE BcnReportingDetail; + OPTIE RequestedInfo; + OPTIE APChannelReport[0..2]; + //OPTIONAL vendor_specific[1..239]; + } + lci (measurement_type IS 8) + { + loc_subject, 1; + OPTIE azimuth_req; + OPTIE req_mac_addr; + OPTIE tgt_mac_addr; + OPTIE max_age; + } + ftmrr (measurement_type IS 16) + { + random_interval, 2; + min_ap_count, 1; + + OPTIE neighbor_rpt; + OPTIE max_age; + } + + }; +} + ///////////////////////////////////////////////////////////////////////////// // MULTIIEs // ///////////////////////////////////////////////////////////////////////////// diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index a174f5e35f9e..e51bd61cb5c3 100644 --- a/core/mac/src/include/dot11f.h +++ b/core/mac/src/include/dot11f.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,7 +35,7 @@ * * * This file was automatically generated by 'framesc' - * Mon Nov 16 14:10:10 2015 from the following file(s): + * Wed Mar 2 11:45:36 2016 from the following file(s): * * dot11f.frms * @@ -2012,44 +2012,6 @@ uint32_t dot11f_get_packed_tlv_P2PManageability( ********************************************************************/ -/* EID 2 (0x02) */ -typedef struct sDot11fIECondensedCountryStr { - uint8_t present; - uint8_t countryStr[2]; -} tDot11fIECondensedCountryStr; - -#define DOT11F_EID_CONDENSEDCOUNTRYSTR (2) - -/* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MIN_LEN (2) - -#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MAX_LEN (2) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -uint32_t dot11f_unpack_ie_condensed_country_str( - tpAniSirGlobal, - uint8_t *, - uint8_t, - tDot11fIECondensedCountryStr*); - -uint32_t dot11f_pack_ie_condensed_country_str( - tpAniSirGlobal, - tDot11fIECondensedCountryStr *, - uint8_t *, - uint32_t, - uint32_t*); - -uint32_t dot11f_get_packed_ie_CondensedCountryStr( - tpAniSirGlobal, - tDot11fIECondensedCountryStr *, - uint32_t*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ - /* EID 2 (0x02) */ typedef struct sDot11fIEGTK { uint8_t present; @@ -2211,45 +2173,6 @@ uint32_t dot11f_get_packed_ie_R1KH_ID( }; /* End extern "C". */ #endif /* C++ */ -/* EID 1 (0x01) */ -typedef struct sDot11fIETSFInfo { - uint8_t present; - uint16_t TsfOffset; - uint16_t BeaconIntvl; -} tDot11fIETSFInfo; - -#define DOT11F_EID_TSFINFO (1) - -/* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_TSFINFO_MIN_LEN (4) - -#define DOT11F_IE_TSFINFO_MAX_LEN (4) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -uint32_t dot11f_unpack_ie_tsf_info( - tpAniSirGlobal, - uint8_t *, - uint8_t, - tDot11fIETSFInfo*); - -uint32_t dot11f_pack_ie_tsf_info( - tpAniSirGlobal, - tDot11fIETSFInfo *, - uint8_t *, - uint32_t, - uint32_t*); - -uint32_t dot11f_get_packed_ie_TSFInfo( - tpAniSirGlobal, - tDot11fIETSFInfo *, - uint32_t*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ - /* EID 51 (0x33) */ typedef struct sDot11fIEAPChannelReport { uint8_t present; @@ -2406,6 +2329,44 @@ uint32_t dot11f_get_packed_ie_BeaconReporting( }; /* End extern "C". */ #endif /* C++ */ +/* EID 2 (0x02) */ +typedef struct sDot11fIECondensedCountryStr { + uint8_t present; + uint8_t countryStr[2]; +} tDot11fIECondensedCountryStr; + +#define DOT11F_EID_CONDENSEDCOUNTRYSTR (2) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MIN_LEN (2) + +#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MAX_LEN (2) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_condensed_country_str( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIECondensedCountryStr*); + +uint32_t dot11f_pack_ie_condensed_country_str( + tpAniSirGlobal, + tDot11fIECondensedCountryStr *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_CondensedCountryStr( + tpAniSirGlobal, + tDot11fIECondensedCountryStr *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + /* EID 66 (0x42) */ typedef struct sDot11fIEMeasurementPilot { uint8_t present; @@ -2904,6 +2865,45 @@ uint32_t dot11f_get_packed_ie_TSDelay( }; /* End extern "C". */ #endif /* C++ */ +/* EID 1 (0x01) */ +typedef struct sDot11fIETSFInfo { + uint8_t present; + uint16_t TsfOffset; + uint16_t BeaconIntvl; +} tDot11fIETSFInfo; + +#define DOT11F_EID_TSFINFO (1) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_TSFINFO_MIN_LEN (4) + +#define DOT11F_IE_TSFINFO_MAX_LEN (4) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_tsf_info( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIETSFInfo*); + +uint32_t dot11f_pack_ie_tsf_info( + tpAniSirGlobal, + tDot11fIETSFInfo *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_TSFInfo( + tpAniSirGlobal, + tDot11fIETSFInfo *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + /* EID 13 (0x0d) */ typedef struct sDot11fIETSPEC { uint8_t present; @@ -3371,6 +3371,216 @@ uint32_t dot11f_get_packed_ie_WiderBWChanSwitchAnn( }; /* End extern "C". */ #endif /* C++ */ +/* EID 1 (0x01) */ +typedef struct sDot11fIEazimuth_req { + uint8_t present; + uint8_t request; +} tDot11fIEazimuth_req; + +#define DOT11F_EID_AZIMUTH_REQ (1) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_AZIMUTH_REQ_MIN_LEN (1) + +#define DOT11F_IE_AZIMUTH_REQ_MAX_LEN (1) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_azimuth_req( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEazimuth_req*); + +uint32_t dot11f_pack_ie_azimuth_req( + tpAniSirGlobal, + tDot11fIEazimuth_req *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_azimuth_req( + tpAniSirGlobal, + tDot11fIEazimuth_req *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 4 (0x04) */ +typedef struct sDot11fIEmax_age { + uint8_t present; + uint16_t max_age; +} tDot11fIEmax_age; + +#define DOT11F_EID_MAX_AGE (4) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_MAX_AGE_MIN_LEN (2) + +#define DOT11F_IE_MAX_AGE_MAX_LEN (2) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_max_age( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEmax_age*); + +uint32_t dot11f_pack_ie_max_age( + tpAniSirGlobal, + tDot11fIEmax_age *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_max_age( + tpAniSirGlobal, + tDot11fIEmax_age *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 52 (0x34) */ +typedef struct sDot11fIEneighbor_rpt { + uint8_t present; + uint8_t bssid[6]; + uint8_t APReachability:2; + uint8_t Security:1; + uint8_t KeyScope:1; + uint8_t SpecMgmtCap:1; + uint8_t QosCap:1; + uint8_t apsd:1; + uint8_t rrm:1; + uint8_t DelayedBA:1; + uint8_t ImmBA:1; + uint8_t MobilityDomain:1; + uint8_t reserved:5; + uint16_t reserved1; + uint8_t regulatoryClass; + uint8_t channel; + uint8_t PhyType; + tDot11fIETSFInfo TSFInfo; + tDot11fIECondensedCountryStr CondensedCountryStr; + tDot11fIEMeasurementPilot MeasurementPilot; + tDot11fIERRMEnabledCap RRMEnabledCap; + tDot11fIEMultiBssid MultiBssid; +} tDot11fIEneighbor_rpt; + +#define DOT11F_EID_NEIGHBOR_RPT (52) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_NEIGHBOR_RPT_MIN_LEN (13) + +#define DOT11F_IE_NEIGHBOR_RPT_MAX_LEN (546) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_neighbor_rpt( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEneighbor_rpt*); + +uint32_t dot11f_pack_ie_neighbor_rpt( + tpAniSirGlobal, + tDot11fIEneighbor_rpt *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_neighbor_rpt( + tpAniSirGlobal, + tDot11fIEneighbor_rpt *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 2 (0x02) */ +typedef struct sDot11fIEreq_mac_addr { + uint8_t present; + uint8_t addr[6]; +} tDot11fIEreq_mac_addr; + +#define DOT11F_EID_REQ_MAC_ADDR (2) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_REQ_MAC_ADDR_MIN_LEN (6) + +#define DOT11F_IE_REQ_MAC_ADDR_MAX_LEN (6) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_req_mac_addr( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEreq_mac_addr*); + +uint32_t dot11f_pack_ie_req_mac_addr( + tpAniSirGlobal, + tDot11fIEreq_mac_addr *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_req_mac_addr( + tpAniSirGlobal, + tDot11fIEreq_mac_addr *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 3 (0x03) */ +typedef struct sDot11fIEtgt_mac_addr { + uint8_t present; + uint8_t addr[6]; +} tDot11fIEtgt_mac_addr; + +#define DOT11F_EID_TGT_MAC_ADDR (3) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_TGT_MAC_ADDR_MIN_LEN (6) + +#define DOT11F_IE_TGT_MAC_ADDR_MAX_LEN (6) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_tgt_mac_addr( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEtgt_mac_addr*); + +uint32_t dot11f_pack_ie_tgt_mac_addr( + tpAniSirGlobal, + tDot11fIEtgt_mac_addr *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_tgt_mac_addr( + tpAniSirGlobal, + tDot11fIEtgt_mac_addr *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + /* EID 197 (0xc5) */ typedef struct sDot11fIEAID { uint8_t present; @@ -4588,13 +4798,26 @@ typedef struct sDot11fIEMeasurementRequest { uint16_t num_APChannelReport; tDot11fIEAPChannelReport APChannelReport[2]; } Beacon; /* measurement_type = 5 */ + struct { + uint8_t loc_subject; + tDot11fIEazimuth_req azimuth_req; + tDot11fIEreq_mac_addr req_mac_addr; + tDot11fIEtgt_mac_addr tgt_mac_addr; + tDot11fIEmax_age max_age; + } lci; /* measurement_type = 8 */ + struct { + uint16_t random_interval; + uint8_t min_ap_count; + tDot11fIEneighbor_rpt neighbor_rpt; + tDot11fIEmax_age max_age; + } ftmrr; /* measurement_type = 16 */ } measurement_request; } tDot11fIEMeasurementRequest; #define DOT11F_EID_MEASUREMENTREQUEST (38) /* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_MEASUREMENTREQUEST_MIN_LEN (14) +#define DOT11F_IE_MEASUREMENTREQUEST_MIN_LEN (4) #define DOT11F_IE_MEASUREMENTREQUEST_MAX_LEN (16) diff --git a/core/mac/src/sys/legacy/src/utils/src/dot11f.c b/core/mac/src/sys/legacy/src/utils/src/dot11f.c index 3cbbf29ae9e1..8c4be956ef30 100644 --- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c +++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -33,7 +33,7 @@ * * * This file was automatically generated by 'framesc' - * Mon Nov 16 10:55:21 2015 from the following file(s): + * Wed Mar 2 11:45:36 2016 from the following file(s): * * dot11f.frms * @@ -1320,24 +1320,6 @@ uint32_t dot11f_unpack_tlv_p2_p_interface(tpAniSirGlobal pCtx, #define SigTlvP2PManageability (0x0025) -uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIECondensedCountryStr *pDst) -{ - uint32_t status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) - status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - DOT11F_MEMCPY(pCtx, pDst->countryStr, pBuf, 2); - (void)pCtx; - return status; -} /* End dot11f_unpack_ie_condensed_country_str. */ - -#define SigIeCondensedCountryStr (0x0001) - - uint32_t dot11f_unpack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, @@ -1371,7 +1353,7 @@ uint32_t dot11f_unpack_ie_gtk(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_gtk. */ -#define SigIeGTK (0x0002) +#define SigIeGTK (0x0001) uint32_t dot11f_unpack_ie_igtk(tpAniSirGlobal pCtx, @@ -1398,7 +1380,7 @@ uint32_t dot11f_unpack_ie_igtk(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_igtk. */ -#define SigIeIGTK (0x0003) +#define SigIeIGTK (0x0002) uint32_t dot11f_unpack_ie_r0_kh_id(tpAniSirGlobal pCtx, @@ -1422,7 +1404,7 @@ uint32_t dot11f_unpack_ie_r0_kh_id(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_r0_kh_id. */ -#define SigIeR0KH_ID (0x0004) +#define SigIeR0KH_ID (0x0003) uint32_t dot11f_unpack_ie_r1_kh_id(tpAniSirGlobal pCtx, @@ -1440,28 +1422,7 @@ uint32_t dot11f_unpack_ie_r1_kh_id(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_r1_kh_id. */ -#define SigIeR1KH_ID (0x0005) - - -uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIETSFInfo *pDst) -{ - uint32_t status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) - status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - framesntohs(pCtx, &pDst->TsfOffset, pBuf, 0); - pBuf += 2; - ielen -= (uint8_t)2; - framesntohs(pCtx, &pDst->BeaconIntvl, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11f_unpack_ie_tsf_info. */ - -#define SigIeTSFInfo (0x0006) +#define SigIeR1KH_ID (0x0004) uint32_t dot11f_unpack_ie_ap_channel_report(tpAniSirGlobal pCtx, @@ -1488,7 +1449,7 @@ uint32_t dot11f_unpack_ie_ap_channel_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ap_channel_report. */ -#define SigIeAPChannelReport (0x0007) +#define SigIeAPChannelReport (0x0005) uint32_t dot11f_unpack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx, @@ -1506,7 +1467,7 @@ uint32_t dot11f_unpack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_bcn_reporting_detail. */ -#define SigIeBcnReportingDetail (0x0008) +#define SigIeBcnReportingDetail (0x0006) uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx, @@ -1530,7 +1491,7 @@ uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_beacon_report_frm_body. */ -#define SigIeBeaconReportFrmBody (0x0009) +#define SigIeBeaconReportFrmBody (0x0007) uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx, @@ -1551,7 +1512,25 @@ uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_beacon_reporting. */ -#define SigIeBeaconReporting (0x000a) +#define SigIeBeaconReporting (0x0008) + + +uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIECondensedCountryStr *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->countryStr, pBuf, 2); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_condensed_country_str. */ + +#define SigIeCondensedCountryStr (0x0009) uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx, @@ -1573,7 +1552,7 @@ uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_pilot. */ -#define SigIeMeasurementPilot (0x000b) +#define SigIeMeasurementPilot (0x000a) uint32_t dot11f_unpack_ie_multi_bssid(tpAniSirGlobal pCtx, @@ -1595,7 +1574,7 @@ uint32_t dot11f_unpack_ie_multi_bssid(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_multi_bssid. */ -#define SigIeMultiBssid (0x000c) +#define SigIeMultiBssid (0x000b) uint32_t dot11f_unpack_ie_ric_data(tpAniSirGlobal pCtx, @@ -1619,7 +1598,7 @@ uint32_t dot11f_unpack_ie_ric_data(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_data. */ -#define SigIeRICData (0x000d) +#define SigIeRICData (0x000c) uint32_t dot11f_unpack_ie_ric_descriptor(tpAniSirGlobal pCtx, @@ -1641,7 +1620,7 @@ uint32_t dot11f_unpack_ie_ric_descriptor(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_descriptor. */ -#define SigIeRICDescriptor (0x000e) +#define SigIeRICDescriptor (0x000d) uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, @@ -1707,7 +1686,7 @@ uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rrm_enabled_cap. */ -#define SigIeRRMEnabledCap (0x000f) +#define SigIeRRMEnabledCap (0x000e) uint32_t dot11f_unpack_ie_requested_info(tpAniSirGlobal pCtx, @@ -1726,7 +1705,7 @@ uint32_t dot11f_unpack_ie_requested_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_requested_info. */ -#define SigIeRequestedInfo (0x0010) +#define SigIeRequestedInfo (0x000f) uint32_t dot11f_unpack_ie_ssid(tpAniSirGlobal pCtx, @@ -1752,7 +1731,7 @@ uint32_t dot11f_unpack_ie_ssid(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ssid. */ -#define SigIeSSID (0x0011) +#define SigIeSSID (0x0010) uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx, @@ -1787,7 +1766,7 @@ uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_schedule. */ -#define SigIeSchedule (0x0012) +#define SigIeSchedule (0x0011) uint32_t dot11f_unpack_ie_tclas(tpAniSirGlobal pCtx, @@ -1878,10 +1857,10 @@ uint32_t dot11f_unpack_ie_tclas(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tclas. */ -#define SigIeTCLAS (0x0013) +#define SigIeTCLAS (0x0012) -#define SigIeTCLASSPROC (0x0014) +#define SigIeTCLASSPROC (0x0013) uint32_t dot11f_unpack_ie_ts_delay(tpAniSirGlobal pCtx, @@ -1899,7 +1878,28 @@ uint32_t dot11f_unpack_ie_ts_delay(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ts_delay. */ -#define SigIeTSDelay (0x0015) +#define SigIeTSDelay (0x0014) + + +uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIETSFInfo *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + framesntohs(pCtx, &pDst->TsfOffset, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + framesntohs(pCtx, &pDst->BeaconIntvl, pBuf, 0); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_tsf_info. */ + +#define SigIeTSFInfo (0x0015) uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx, @@ -2369,6 +2369,163 @@ uint32_t dot11f_unpack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx, #define SigIeWiderBWChanSwitchAnn (0x001e) +uint32_t dot11f_unpack_ie_azimuth_req(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEazimuth_req *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->request = *pBuf; + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_azimuth_req. */ + +#define SigIeazimuth_req (0x001f) + + +uint32_t dot11f_unpack_ie_max_age(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEmax_age *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + framesntohs(pCtx, &pDst->max_age, pBuf, 0); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_max_age. */ + +#define SigIemax_age (0x0020) + + +static const tFFDefn FFS_neighbor_rpt[] = { + { NULL, 0, 0, 0,}, +}; + +static const tIEDefn IES_neighbor_rpt[] = { + { offsetof(tDot11fIEneighbor_rpt, TSFInfo), offsetof(tDot11fIETSFInfo, + present), 0, "TSFInfo", 0, 6, 6, SigIeTSFInfo, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_TSFINFO, 0, }, + { offsetof(tDot11fIEneighbor_rpt, CondensedCountryStr), + offsetof(tDot11fIECondensedCountryStr, present), 0, "CondensedCountryStr", + 0, 4, 4, SigIeCondensedCountryStr, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_CONDENSEDCOUNTRYSTR, 0, }, + { offsetof(tDot11fIEneighbor_rpt, MeasurementPilot), + offsetof(tDot11fIEMeasurementPilot, present), 0, "MeasurementPilot", + 0, 3, 258, SigIeMeasurementPilot, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MEASUREMENTPILOT, 0, }, + { offsetof(tDot11fIEneighbor_rpt, RRMEnabledCap), + offsetof(tDot11fIERRMEnabledCap, present), 0, "RRMEnabledCap", + 0, 7, 7, SigIeRRMEnabledCap, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_RRMENABLEDCAP, 0, }, + { offsetof(tDot11fIEneighbor_rpt, MultiBssid), + offsetof(tDot11fIEMultiBssid, present), 0, "MultiBssid", + 0, 3, 258, SigIeMultiBssid, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MULTIBSSID, 0, }, + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, +}; + +uint32_t dot11f_unpack_ie_neighbor_rpt(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEneighbor_rpt *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp24__; + uint8_t tmp25__; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6); + pBuf += 6; + ielen -= (uint8_t)6; + tmp24__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->APReachability = tmp24__ >> 0 & 0x3; + pDst->Security = tmp24__ >> 2 & 0x1; + pDst->KeyScope = tmp24__ >> 3 & 0x1; + pDst->SpecMgmtCap = tmp24__ >> 4 & 0x1; + pDst->QosCap = tmp24__ >> 5 & 0x1; + pDst->apsd = tmp24__ >> 6 & 0x1; + pDst->rrm = tmp24__ >> 7 & 0x1; + tmp25__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->DelayedBA = tmp25__ >> 0 & 0x1; + pDst->ImmBA = tmp25__ >> 1 & 0x1; + pDst->MobilityDomain = tmp25__ >> 2 & 0x1; + pDst->reserved = tmp25__ >> 3 & 0x1f; + framesntohs(pCtx, &pDst->reserved1, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + pDst->regulatoryClass = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + pDst->channel = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + pDst->PhyType = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + (void)pCtx; + status |= unpack_core(pCtx, + pBuf, + ielen, + FFS_neighbor_rpt, + IES_neighbor_rpt, + (uint8_t *)pDst, + sizeof(*pDst)); + return status; +} /* End dot11f_unpack_ie_neighbor_rpt. */ + +#define SigIeneighbor_rpt (0x0021) + + +uint32_t dot11f_unpack_ie_req_mac_addr(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEreq_mac_addr *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->addr, pBuf, 6); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_req_mac_addr. */ + +#define SigIereq_mac_addr (0x0022) + + +uint32_t dot11f_unpack_ie_tgt_mac_addr(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEtgt_mac_addr *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->addr, pBuf, 6); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_tgt_mac_addr. */ + +#define SigIetgt_mac_addr (0x0023) + + uint32_t dot11f_unpack_ie_aid(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, @@ -2384,7 +2541,7 @@ uint32_t dot11f_unpack_ie_aid(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_aid. */ -#define SigIeAID (0x001f) +#define SigIeAID (0x0024) uint32_t dot11f_unpack_ie_cf_params(tpAniSirGlobal pCtx, @@ -2411,7 +2568,7 @@ uint32_t dot11f_unpack_ie_cf_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_cf_params. */ -#define SigIeCFParams (0x0020) +#define SigIeCFParams (0x0025) uint32_t dot11f_unpack_ie_challenge_text(tpAniSirGlobal pCtx, @@ -2435,7 +2592,7 @@ uint32_t dot11f_unpack_ie_challenge_text(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_challenge_text. */ -#define SigIeChallengeText (0x0021) +#define SigIeChallengeText (0x0026) uint32_t dot11f_unpack_ie_chan_switch_ann(tpAniSirGlobal pCtx, @@ -2459,7 +2616,7 @@ uint32_t dot11f_unpack_ie_chan_switch_ann(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_chan_switch_ann. */ -#define SigIeChanSwitchAnn (0x0022) +#define SigIeChanSwitchAnn (0x0027) static const tFFDefn FFS_ChannelSwitchWrapper[] = { @@ -2495,7 +2652,7 @@ uint32_t dot11f_unpack_ie_channel_switch_wrapper(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_channel_switch_wrapper. */ -#define SigIeChannelSwitchWrapper (0x0023) +#define SigIeChannelSwitchWrapper (0x0028) uint32_t dot11f_unpack_ie_country(tpAniSirGlobal pCtx, @@ -2527,10 +2684,10 @@ uint32_t dot11f_unpack_ie_country(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_country. */ -#define SigIeCountry (0x0024) +#define SigIeCountry (0x0029) -#define SigIeDSParams (0x0025) +#define SigIeDSParams (0x002a) uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, @@ -2539,14 +2696,14 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, tDot11fIEEDCAParamSet *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp24__; - uint8_t tmp25__; uint8_t tmp26__; uint8_t tmp27__; uint8_t tmp28__; uint8_t tmp29__; uint8_t tmp30__; uint8_t tmp31__; + uint8_t tmp32__; + uint8_t tmp33__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -2557,69 +2714,69 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, pDst->reserved = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp24__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_aifsn = tmp24__ >> 0 & 0xf; - pDst->acbe_acm = tmp24__ >> 4 & 0x1; - pDst->acbe_aci = tmp24__ >> 5 & 0x3; - pDst->unused1 = tmp24__ >> 7 & 0x1; - tmp25__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_acwmin = tmp25__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp25__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); - pBuf += 2; - ielen -= (uint8_t)2; tmp26__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp26__ >> 0 & 0xf; - pDst->acbk_acm = tmp26__ >> 4 & 0x1; - pDst->acbk_aci = tmp26__ >> 5 & 0x3; - pDst->unused2 = tmp26__ >> 7 & 0x1; + pDst->acbe_aifsn = tmp26__ >> 0 & 0xf; + pDst->acbe_acm = tmp26__ >> 4 & 0x1; + pDst->acbe_aci = tmp26__ >> 5 & 0x3; + pDst->unused1 = tmp26__ >> 7 & 0x1; tmp27__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp27__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp27__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); + pDst->acbe_acwmin = tmp27__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp27__ >> 4 & 0xf; + framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; tmp28__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp28__ >> 0 & 0xf; - pDst->acvi_acm = tmp28__ >> 4 & 0x1; - pDst->acvi_aci = tmp28__ >> 5 & 0x3; - pDst->unused3 = tmp28__ >> 7 & 0x1; + pDst->acbk_aifsn = tmp28__ >> 0 & 0xf; + pDst->acbk_acm = tmp28__ >> 4 & 0x1; + pDst->acbk_aci = tmp28__ >> 5 & 0x3; + pDst->unused2 = tmp28__ >> 7 & 0x1; tmp29__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp29__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp29__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); + pDst->acbk_acwmin = tmp29__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp29__ >> 4 & 0xf; + framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; tmp30__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp30__ >> 0 & 0xf; - pDst->acvo_acm = tmp30__ >> 4 & 0x1; - pDst->acvo_aci = tmp30__ >> 5 & 0x3; - pDst->unused4 = tmp30__ >> 7 & 0x1; + pDst->acvi_aifsn = tmp30__ >> 0 & 0xf; + pDst->acvi_acm = tmp30__ >> 4 & 0x1; + pDst->acvi_aci = tmp30__ >> 5 & 0x3; + pDst->unused3 = tmp30__ >> 7 & 0x1; tmp31__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp31__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp31__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp31__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp31__ >> 4 & 0xf; + framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + tmp32__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_aifsn = tmp32__ >> 0 & 0xf; + pDst->acvo_acm = tmp32__ >> 4 & 0x1; + pDst->acvo_aci = tmp32__ >> 5 & 0x3; + pDst->unused4 = tmp32__ >> 7 & 0x1; + tmp33__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_acwmin = tmp33__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp33__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11f_unpack_ie_edca_param_set. */ -#define SigIeEDCAParamSet (0x0026) +#define SigIeEDCAParamSet (0x002b) uint32_t dot11f_unpack_ie_erp_info(tpAniSirGlobal pCtx, @@ -2628,21 +2785,21 @@ uint32_t dot11f_unpack_ie_erp_info(tpAniSirGlobal pCtx, tDot11fIEERPInfo *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp32__; + uint8_t tmp34__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp32__ = *pBuf; - pDst->non_erp_present = tmp32__ >> 0 & 0x1; - pDst->use_prot = tmp32__ >> 1 & 0x1; - pDst->barker_preamble = tmp32__ >> 2 & 0x1; - pDst->unused = tmp32__ >> 3 & 0x1f; + tmp34__ = *pBuf; + pDst->non_erp_present = tmp34__ >> 0 & 0x1; + pDst->use_prot = tmp34__ >> 1 & 0x1; + pDst->barker_preamble = tmp34__ >> 2 & 0x1; + pDst->unused = tmp34__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11f_unpack_ie_erp_info. */ -#define SigIeERPInfo (0x0027) +#define SigIeERPInfo (0x002c) uint32_t dot11f_unpack_ie_ese_cckm_opaque(tpAniSirGlobal pCtx, @@ -2666,7 +2823,7 @@ uint32_t dot11f_unpack_ie_ese_cckm_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_cckm_opaque. */ -#define SigIeESECckmOpaque (0x0028) +#define SigIeESECckmOpaque (0x002d) uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, @@ -2675,7 +2832,7 @@ uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, tDot11fIEESERadMgmtCap *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp33__; + uint8_t tmp35__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -2683,14 +2840,14 @@ uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, pDst->mgmt_state = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp33__ = *pBuf; - pDst->mbssid_mask = tmp33__ >> 0 & 0x7; - pDst->reserved = tmp33__ >> 3 & 0x1f; + tmp35__ = *pBuf; + pDst->mbssid_mask = tmp35__ >> 0 & 0x7; + pDst->reserved = tmp35__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11f_unpack_ie_ese_rad_mgmt_cap. */ -#define SigIeESERadMgmtCap (0x0029) +#define SigIeESERadMgmtCap (0x002e) uint32_t dot11f_unpack_ie_ese_traf_strm_met(tpAniSirGlobal pCtx, @@ -2714,7 +2871,7 @@ uint32_t dot11f_unpack_ie_ese_traf_strm_met(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_traf_strm_met. */ -#define SigIeESETrafStrmMet (0x002a) +#define SigIeESETrafStrmMet (0x002f) uint32_t dot11f_unpack_ie_ese_traf_strm_rate_set(tpAniSirGlobal pCtx, @@ -2741,7 +2898,7 @@ uint32_t dot11f_unpack_ie_ese_traf_strm_rate_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_traf_strm_rate_set. */ -#define SigIeESETrafStrmRateSet (0x002b) +#define SigIeESETrafStrmRateSet (0x0030) uint32_t dot11f_unpack_ie_ese_txmit_power(tpAniSirGlobal pCtx, @@ -2762,7 +2919,7 @@ uint32_t dot11f_unpack_ie_ese_txmit_power(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_txmit_power. */ -#define SigIeESETxmitPower (0x002c) +#define SigIeESETxmitPower (0x0031) uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx, @@ -2780,7 +2937,7 @@ uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_version. */ -#define SigIeESEVersion (0x002d) +#define SigIeESEVersion (0x0032) uint32_t dot11f_unpack_ie_ext_cap(tpAniSirGlobal pCtx, @@ -2809,7 +2966,7 @@ endUnpackIeExtCap: return status; } /* End dot11f_unpack_ie_ext_cap. */ -#define SigIeExtCap (0x002e) +#define SigIeExtCap (0x0033) uint32_t dot11f_unpack_ie_ext_supp_rates(tpAniSirGlobal pCtx, @@ -2841,7 +2998,7 @@ uint32_t dot11f_unpack_ie_ext_supp_rates(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ext_supp_rates. */ -#define SigIeExtSuppRates (0x002f) +#define SigIeExtSuppRates (0x0034) uint32_t dot11f_unpack_ie_fh_param_set(tpAniSirGlobal pCtx, @@ -2868,7 +3025,7 @@ uint32_t dot11f_unpack_ie_fh_param_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_param_set. */ -#define SigIeFHParamSet (0x0030) +#define SigIeFHParamSet (0x0035) uint32_t dot11f_unpack_ie_fh_params(tpAniSirGlobal pCtx, @@ -2889,7 +3046,7 @@ uint32_t dot11f_unpack_ie_fh_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_params. */ -#define SigIeFHParams (0x0031) +#define SigIeFHParams (0x0036) uint32_t dot11f_unpack_ie_fh_patt_table(tpAniSirGlobal pCtx, @@ -2925,7 +3082,7 @@ uint32_t dot11f_unpack_ie_fh_patt_table(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_patt_table. */ -#define SigIeFHPattTable (0x0032) +#define SigIeFHPattTable (0x0037) static const tFFDefn FFS_FTInfo[] = { @@ -2952,16 +3109,16 @@ uint32_t dot11f_unpack_ie_ft_info(tpAniSirGlobal pCtx, tDot11fIEFTInfo *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp34__; + uint16_t tmp36__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp34__, pBuf, 0); + framesntohs(pCtx, &tmp36__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->reserved = tmp34__ >> 0 & 0xff; - pDst->IECount = tmp34__ >> 8 & 0xff; + pDst->reserved = tmp36__ >> 0 & 0xff; + pDst->IECount = tmp36__ >> 8 & 0xff; DOT11F_MEMCPY(pCtx, pDst->MIC, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; @@ -2982,7 +3139,7 @@ uint32_t dot11f_unpack_ie_ft_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ft_info. */ -#define SigIeFTInfo (0x0033) +#define SigIeFTInfo (0x0038) uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, @@ -2991,79 +3148,79 @@ uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, tDot11fIEHTCaps *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp35__; - uint8_t tmp36__; uint16_t tmp37__; - uint32_t tmp38__; - uint8_t tmp39__; + uint8_t tmp38__; + uint16_t tmp39__; + uint32_t tmp40__; + uint8_t tmp41__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp35__, pBuf, 0); - pBuf += 2; - ielen -= 2; - pDst->advCodingCap = tmp35__ >> 0 & 0x1; - pDst->supportedChannelWidthSet = tmp35__ >> 1 & 0x1; - pDst->mimoPowerSave = tmp35__ >> 2 & 0x3; - pDst->greenField = tmp35__ >> 4 & 0x1; - pDst->shortGI20MHz = tmp35__ >> 5 & 0x1; - pDst->shortGI40MHz = tmp35__ >> 6 & 0x1; - pDst->txSTBC = tmp35__ >> 7 & 0x1; - pDst->rxSTBC = tmp35__ >> 8 & 0x3; - pDst->delayedBA = tmp35__ >> 10 & 0x1; - pDst->maximalAMSDUsize = tmp35__ >> 11 & 0x1; - pDst->dsssCckMode40MHz = tmp35__ >> 12 & 0x1; - pDst->psmp = tmp35__ >> 13 & 0x1; - pDst->stbcControlFrame = tmp35__ >> 14 & 0x1; - pDst->lsigTXOPProtection = tmp35__ >> 15 & 0x1; - tmp36__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->maxRxAMPDUFactor = tmp36__ >> 0 & 0x3; - pDst->mpduDensity = tmp36__ >> 2 & 0x7; - pDst->reserved1 = tmp36__ >> 5 & 0x7; - DOT11F_MEMCPY(pCtx, pDst->supportedMCSSet, pBuf, 16); - pBuf += 16; - ielen -= (uint8_t)16; framesntohs(pCtx, &tmp37__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->pco = tmp37__ >> 0 & 0x1; - pDst->transitionTime = tmp37__ >> 1 & 0x3; - pDst->reserved2 = tmp37__ >> 3 & 0x1f; - pDst->mcsFeedback = tmp37__ >> 8 & 0x3; - pDst->reserved3 = tmp37__ >> 10 & 0x3f; - framesntohl(pCtx, &tmp38__, pBuf, 0); - pBuf += 4; - ielen -= 4; - pDst->txBF = tmp38__ >> 0 & 0x1; - pDst->rxStaggeredSounding = tmp38__ >> 1 & 0x1; - pDst->txStaggeredSounding = tmp38__ >> 2 & 0x1; - pDst->rxZLF = tmp38__ >> 3 & 0x1; - pDst->txZLF = tmp38__ >> 4 & 0x1; - pDst->implicitTxBF = tmp38__ >> 5 & 0x1; - pDst->calibration = tmp38__ >> 6 & 0x3; - pDst->explicitCSITxBF = tmp38__ >> 8 & 0x1; - pDst->explicitUncompressedSteeringMatrix = tmp38__ >> 9 & 0x1; - pDst->explicitBFCSIFeedback = tmp38__ >> 10 & 0x7; - pDst->explicitUncompressedSteeringMatrixFeedback = tmp38__ >> 13 & 0x7; - pDst->explicitCompressedSteeringMatrixFeedback = tmp38__ >> 16 & 0x7; - pDst->csiNumBFAntennae = tmp38__ >> 19 & 0x3; - pDst->uncompressedSteeringMatrixBFAntennae = tmp38__ >> 21 & 0x3; - pDst->compressedSteeringMatrixBFAntennae = tmp38__ >> 23 & 0x3; - pDst->reserved4 = tmp38__ >> 25 & 0x7f; - tmp39__ = *pBuf; + pDst->advCodingCap = tmp37__ >> 0 & 0x1; + pDst->supportedChannelWidthSet = tmp37__ >> 1 & 0x1; + pDst->mimoPowerSave = tmp37__ >> 2 & 0x3; + pDst->greenField = tmp37__ >> 4 & 0x1; + pDst->shortGI20MHz = tmp37__ >> 5 & 0x1; + pDst->shortGI40MHz = tmp37__ >> 6 & 0x1; + pDst->txSTBC = tmp37__ >> 7 & 0x1; + pDst->rxSTBC = tmp37__ >> 8 & 0x3; + pDst->delayedBA = tmp37__ >> 10 & 0x1; + pDst->maximalAMSDUsize = tmp37__ >> 11 & 0x1; + pDst->dsssCckMode40MHz = tmp37__ >> 12 & 0x1; + pDst->psmp = tmp37__ >> 13 & 0x1; + pDst->stbcControlFrame = tmp37__ >> 14 & 0x1; + pDst->lsigTXOPProtection = tmp37__ >> 15 & 0x1; + tmp38__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->antennaSelection = tmp39__ >> 0 & 0x1; - pDst->explicitCSIFeedbackTx = tmp39__ >> 1 & 0x1; - pDst->antennaIndicesFeedbackTx = tmp39__ >> 2 & 0x1; - pDst->explicitCSIFeedback = tmp39__ >> 3 & 0x1; - pDst->antennaIndicesFeedback = tmp39__ >> 4 & 0x1; - pDst->rxAS = tmp39__ >> 5 & 0x1; - pDst->txSoundingPPDUs = tmp39__ >> 6 & 0x1; - pDst->reserved5 = tmp39__ >> 7 & 0x1; + pDst->maxRxAMPDUFactor = tmp38__ >> 0 & 0x3; + pDst->mpduDensity = tmp38__ >> 2 & 0x7; + pDst->reserved1 = tmp38__ >> 5 & 0x7; + DOT11F_MEMCPY(pCtx, pDst->supportedMCSSet, pBuf, 16); + pBuf += 16; + ielen -= (uint8_t)16; + framesntohs(pCtx, &tmp39__, pBuf, 0); + pBuf += 2; + ielen -= 2; + pDst->pco = tmp39__ >> 0 & 0x1; + pDst->transitionTime = tmp39__ >> 1 & 0x3; + pDst->reserved2 = tmp39__ >> 3 & 0x1f; + pDst->mcsFeedback = tmp39__ >> 8 & 0x3; + pDst->reserved3 = tmp39__ >> 10 & 0x3f; + framesntohl(pCtx, &tmp40__, pBuf, 0); + pBuf += 4; + ielen -= 4; + pDst->txBF = tmp40__ >> 0 & 0x1; + pDst->rxStaggeredSounding = tmp40__ >> 1 & 0x1; + pDst->txStaggeredSounding = tmp40__ >> 2 & 0x1; + pDst->rxZLF = tmp40__ >> 3 & 0x1; + pDst->txZLF = tmp40__ >> 4 & 0x1; + pDst->implicitTxBF = tmp40__ >> 5 & 0x1; + pDst->calibration = tmp40__ >> 6 & 0x3; + pDst->explicitCSITxBF = tmp40__ >> 8 & 0x1; + pDst->explicitUncompressedSteeringMatrix = tmp40__ >> 9 & 0x1; + pDst->explicitBFCSIFeedback = tmp40__ >> 10 & 0x7; + pDst->explicitUncompressedSteeringMatrixFeedback = tmp40__ >> 13 & 0x7; + pDst->explicitCompressedSteeringMatrixFeedback = tmp40__ >> 16 & 0x7; + pDst->csiNumBFAntennae = tmp40__ >> 19 & 0x3; + pDst->uncompressedSteeringMatrixBFAntennae = tmp40__ >> 21 & 0x3; + pDst->compressedSteeringMatrixBFAntennae = tmp40__ >> 23 & 0x3; + pDst->reserved4 = tmp40__ >> 25 & 0x7f; + tmp41__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->antennaSelection = tmp41__ >> 0 & 0x1; + pDst->explicitCSIFeedbackTx = tmp41__ >> 1 & 0x1; + pDst->antennaIndicesFeedbackTx = tmp41__ >> 2 & 0x1; + pDst->explicitCSIFeedback = tmp41__ >> 3 & 0x1; + pDst->antennaIndicesFeedback = tmp41__ >> 4 & 0x1; + pDst->rxAS = tmp41__ >> 5 & 0x1; + pDst->txSoundingPPDUs = tmp41__ >> 6 & 0x1; + pDst->reserved5 = tmp41__ >> 7 & 0x1; pDst->num_rsvd = (uint8_t)(ielen); if (ielen > 32) { pDst->present = 0; @@ -3075,7 +3232,7 @@ uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht_caps. */ -#define SigIeHTCaps (0x0034) +#define SigIeHTCaps (0x0039) uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, @@ -3084,9 +3241,9 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, tDot11fIEHTInfo *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp40__; - uint16_t tmp41__; - uint16_t tmp42__; + uint8_t tmp42__; + uint16_t tmp43__; + uint16_t tmp44__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3094,32 +3251,32 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, pDst->primaryChannel = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp40__ = *pBuf; + tmp42__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->secondaryChannelOffset = tmp40__ >> 0 & 0x3; - pDst->recommendedTxWidthSet = tmp40__ >> 2 & 0x1; - pDst->rifsMode = tmp40__ >> 3 & 0x1; - pDst->controlledAccessOnly = tmp40__ >> 4 & 0x1; - pDst->serviceIntervalGranularity = tmp40__ >> 5 & 0x7; - framesntohs(pCtx, &tmp41__, pBuf, 0); + pDst->secondaryChannelOffset = tmp42__ >> 0 & 0x3; + pDst->recommendedTxWidthSet = tmp42__ >> 2 & 0x1; + pDst->rifsMode = tmp42__ >> 3 & 0x1; + pDst->controlledAccessOnly = tmp42__ >> 4 & 0x1; + pDst->serviceIntervalGranularity = tmp42__ >> 5 & 0x7; + framesntohs(pCtx, &tmp43__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->opMode = tmp41__ >> 0 & 0x3; - pDst->nonGFDevicesPresent = tmp41__ >> 2 & 0x1; - pDst->transmitBurstLimit = tmp41__ >> 3 & 0x1; - pDst->obssNonHTStaPresent = tmp41__ >> 4 & 0x1; - pDst->reserved = tmp41__ >> 5 & 0x7ff; - framesntohs(pCtx, &tmp42__, pBuf, 0); + pDst->opMode = tmp43__ >> 0 & 0x3; + pDst->nonGFDevicesPresent = tmp43__ >> 2 & 0x1; + pDst->transmitBurstLimit = tmp43__ >> 3 & 0x1; + pDst->obssNonHTStaPresent = tmp43__ >> 4 & 0x1; + pDst->reserved = tmp43__ >> 5 & 0x7ff; + framesntohs(pCtx, &tmp44__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->basicSTBCMCS = tmp42__ >> 0 & 0x7f; - pDst->dualCTSProtection = tmp42__ >> 7 & 0x1; - pDst->secondaryBeacon = tmp42__ >> 8 & 0x1; - pDst->lsigTXOPProtectionFullSupport = tmp42__ >> 9 & 0x1; - pDst->pcoActive = tmp42__ >> 10 & 0x1; - pDst->pcoPhase = tmp42__ >> 11 & 0x1; - pDst->reserved2 = tmp42__ >> 12 & 0xf; + pDst->basicSTBCMCS = tmp44__ >> 0 & 0x7f; + pDst->dualCTSProtection = tmp44__ >> 7 & 0x1; + pDst->secondaryBeacon = tmp44__ >> 8 & 0x1; + pDst->lsigTXOPProtectionFullSupport = tmp44__ >> 9 & 0x1; + pDst->pcoActive = tmp44__ >> 10 & 0x1; + pDst->pcoPhase = tmp44__ >> 11 & 0x1; + pDst->reserved2 = tmp44__ >> 12 & 0xf; DOT11F_MEMCPY(pCtx, pDst->basicMCSSet, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; @@ -3134,7 +3291,7 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht_info. */ -#define SigIeHTInfo (0x0035) +#define SigIeHTInfo (0x003a) uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx, @@ -3152,7 +3309,7 @@ uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ibss_params. */ -#define SigIeIBSSParams (0x0036) +#define SigIeIBSSParams (0x003b) uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, @@ -3176,7 +3333,7 @@ uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_link_identifier. */ -#define SigIeLinkIdentifier (0x0037) +#define SigIeLinkIdentifier (0x003c) static const tFFDefn FFS_reportBeacon[] = { @@ -3198,9 +3355,9 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, tDot11fIEMeasurementReport *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp43__; - uint8_t tmp44__; uint8_t tmp45__; + uint8_t tmp46__; + uint8_t tmp47__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3208,13 +3365,13 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, pDst->token = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp43__ = *pBuf; + tmp45__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->late = tmp43__ >> 0 & 0x1; - pDst->incapable = tmp43__ >> 1 & 0x1; - pDst->refused = tmp43__ >> 2 & 0x1; - pDst->unused = tmp43__ >> 3 & 0x1f; + pDst->late = tmp45__ >> 0 & 0x1; + pDst->incapable = tmp45__ >> 1 & 0x1; + pDst->refused = tmp45__ >> 2 & 0x1; + pDst->unused = tmp45__ >> 3 & 0x1f; pDst->type = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3232,15 +3389,15 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, framesntohs(pCtx, &pDst->report.Basic.meas_duration, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp44__ = *pBuf; + tmp46__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Basic.bss = tmp44__ >> 0 & 0x1; - pDst->report.Basic.ofdm_preamble = tmp44__ >> 1 & 0x1; - pDst->report.Basic.unid_signal = tmp44__ >> 2 & 0x1; - pDst->report.Basic.rader = tmp44__ >> 3 & 0x1; - pDst->report.Basic.unmeasured = tmp44__ >> 4 & 0x1; - pDst->report.Basic.unused = tmp44__ >> 5 & 0x7; + pDst->report.Basic.bss = tmp46__ >> 0 & 0x1; + pDst->report.Basic.ofdm_preamble = tmp46__ >> 1 & 0x1; + pDst->report.Basic.unid_signal = tmp46__ >> 2 & 0x1; + pDst->report.Basic.rader = tmp46__ >> 3 & 0x1; + pDst->report.Basic.unmeasured = tmp46__ >> 4 & 0x1; + pDst->report.Basic.unused = tmp46__ >> 5 & 0x7; break; case 1: pDst->report.CCA.channel = *pBuf; @@ -3304,11 +3461,11 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, framesntohs(pCtx, &pDst->report.Beacon.meas_duration, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp45__ = *pBuf; + tmp47__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Beacon.condensed_PHY = tmp45__ >> 0 & 0x7f; - pDst->report.Beacon.reported_frame_type = tmp45__ >> 7 & 0x1; + pDst->report.Beacon.condensed_PHY = tmp47__ >> 0 & 0x7f; + pDst->report.Beacon.reported_frame_type = tmp47__ >> 7 & 0x1; pDst->report.Beacon.RCPI = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3338,7 +3495,7 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_report. */ -#define SigIeMeasurementReport (0x0038) +#define SigIeMeasurementReport (0x003d) static const tFFDefn FFS_measurement_requestBeacon[] = { @@ -3371,13 +3528,53 @@ static const tIEDefn IES_measurement_requestBeacon[] = { {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; +static const tFFDefn FFS_measurement_requestlci[] = { + { NULL, 0, 0, 0,}, +}; + +static const tIEDefn IES_measurement_requestlci[] = { + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.azimuth_req), offsetof(tDot11fIEazimuth_req, + present), 0, "azimuth_req", 0, 3, 3, SigIeazimuth_req, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_AZIMUTH_REQ, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.req_mac_addr), offsetof(tDot11fIEreq_mac_addr, + present), 0, "req_mac_addr", 0, 8, 8, SigIereq_mac_addr, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_REQ_MAC_ADDR, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.tgt_mac_addr), offsetof(tDot11fIEtgt_mac_addr, + present), 0, "tgt_mac_addr", 0, 8, 8, SigIetgt_mac_addr, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_TGT_MAC_ADDR, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.max_age), offsetof(tDot11fIEmax_age, present), 0, + "max_age", 0, 4, 4, SigIemax_age, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MAX_AGE, 0, }, + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, +}; + +static const tFFDefn FFS_measurement_requestftmrr[] = { + { NULL, 0, 0, 0,}, +}; + +static const tIEDefn IES_measurement_requestftmrr[] = { + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.ftmrr.neighbor_rpt), offsetof(tDot11fIEneighbor_rpt, + present), 0, "neighbor_rpt", 0, 15, 548, SigIeneighbor_rpt, + {0, 0, 0, 0, 0}, 0, DOT11F_EID_NEIGHBOR_RPT, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.ftmrr.max_age), offsetof(tDot11fIEmax_age, present), + 0, "max_age", 0, 4, 4, SigIemax_age, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MAX_AGE, 0, }, + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, +}; + uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, tDot11fIEMeasurementRequest *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp46__; + uint8_t tmp48__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3385,15 +3582,15 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, pDst->measurement_token = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp46__ = *pBuf; + tmp48__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->parallel = tmp46__ >> 0 & 0x1; - pDst->enable = tmp46__ >> 1 & 0x1; - pDst->request = tmp46__ >> 2 & 0x1; - pDst->report = tmp46__ >> 3 & 0x1; - pDst->durationMandatory = tmp46__ >> 4 & 0x1; - pDst->unused = tmp46__ >> 5 & 0x7; + pDst->parallel = tmp48__ >> 0 & 0x1; + pDst->enable = tmp48__ >> 1 & 0x1; + pDst->request = tmp48__ >> 2 & 0x1; + pDst->report = tmp48__ >> 3 & 0x1; + pDst->durationMandatory = tmp48__ >> 4 & 0x1; + pDst->unused = tmp48__ >> 5 & 0x7; pDst->measurement_type = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3458,12 +3655,39 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, (uint8_t *)pDst, sizeof(*pDst)); break; + case 8: + pDst->measurement_request.lci.loc_subject = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + status |= unpack_core(pCtx, + pBuf, + ielen, + FFS_measurement_requestlci, + IES_measurement_requestlci, + (uint8_t *)pDst, + sizeof(*pDst)); + break; + case 16: + framesntohs(pCtx, &pDst->measurement_request.ftmrr.random_interval, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + pDst->measurement_request.ftmrr.min_ap_count = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + status |= unpack_core(pCtx, + pBuf, + ielen, + FFS_measurement_requestftmrr, + IES_measurement_requestftmrr, + (uint8_t *)pDst, + sizeof(*pDst)); + break; } (void)pCtx; return status; } /* End dot11f_unpack_ie_measurement_request. */ -#define SigIeMeasurementRequest (0x0039) +#define SigIeMeasurementRequest (0x003e) uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, @@ -3472,7 +3696,7 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, tDot11fIEMobilityDomain *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp47__; + uint8_t tmp49__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3480,15 +3704,15 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, framesntohs(pCtx, &pDst->MDID, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp47__ = *pBuf; - pDst->overDSCap = tmp47__ >> 0 & 0x1; - pDst->resourceReqCap = tmp47__ >> 1 & 0x1; - pDst->reserved = tmp47__ >> 2 & 0x3f; + tmp49__ = *pBuf; + pDst->overDSCap = tmp49__ >> 0 & 0x1; + pDst->resourceReqCap = tmp49__ >> 1 & 0x1; + pDst->reserved = tmp49__ >> 2 & 0x3f; (void)pCtx; return status; } /* End dot11f_unpack_ie_mobility_domain. */ -#define SigIeMobilityDomain (0x003a) +#define SigIeMobilityDomain (0x003f) static const tFFDefn FFS_NeighborReport[] = { @@ -3524,8 +3748,8 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, tDot11fIENeighborReport *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp48__; - uint8_t tmp49__; + uint8_t tmp50__; + uint8_t tmp51__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3533,23 +3757,23 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6); pBuf += 6; ielen -= (uint8_t)6; - tmp48__ = *pBuf; + tmp50__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->APReachability = tmp48__ >> 0 & 0x3; - pDst->Security = tmp48__ >> 2 & 0x1; - pDst->KeyScope = tmp48__ >> 3 & 0x1; - pDst->SpecMgmtCap = tmp48__ >> 4 & 0x1; - pDst->QosCap = tmp48__ >> 5 & 0x1; - pDst->apsd = tmp48__ >> 6 & 0x1; - pDst->rrm = tmp48__ >> 7 & 0x1; - tmp49__ = *pBuf; + pDst->APReachability = tmp50__ >> 0 & 0x3; + pDst->Security = tmp50__ >> 2 & 0x1; + pDst->KeyScope = tmp50__ >> 3 & 0x1; + pDst->SpecMgmtCap = tmp50__ >> 4 & 0x1; + pDst->QosCap = tmp50__ >> 5 & 0x1; + pDst->apsd = tmp50__ >> 6 & 0x1; + pDst->rrm = tmp50__ >> 7 & 0x1; + tmp51__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->DelayedBA = tmp49__ >> 0 & 0x1; - pDst->ImmBA = tmp49__ >> 1 & 0x1; - pDst->MobilityDomain = tmp49__ >> 2 & 0x1; - pDst->reserved = tmp49__ >> 3 & 0x1f; + pDst->DelayedBA = tmp51__ >> 0 & 0x1; + pDst->ImmBA = tmp51__ >> 1 & 0x1; + pDst->MobilityDomain = tmp51__ >> 2 & 0x1; + pDst->reserved = tmp51__ >> 3 & 0x1f; framesntohs(pCtx, &pDst->reserved1, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -3573,7 +3797,7 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_neighbor_report. */ -#define SigIeNeighborReport (0x003b) +#define SigIeNeighborReport (0x0040) uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, @@ -3609,7 +3833,7 @@ uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_obss_scan_parameters. */ -#define SigIeOBSSScanParameters (0x003c) +#define SigIeOBSSScanParameters (0x0041) uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, @@ -3618,21 +3842,21 @@ uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, tDot11fIEOperatingMode *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp50__; + uint8_t tmp52__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp50__ = *pBuf; - pDst->chanWidth = tmp50__ >> 0 & 0x3; - pDst->reserved = tmp50__ >> 2 & 0x3; - pDst->rxNSS = tmp50__ >> 4 & 0x7; - pDst->rxNSSType = tmp50__ >> 7 & 0x1; + tmp52__ = *pBuf; + pDst->chanWidth = tmp52__ >> 0 & 0x3; + pDst->reserved = tmp52__ >> 2 & 0x3; + pDst->rxNSS = tmp52__ >> 4 & 0x7; + pDst->rxNSSType = tmp52__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_operating_mode. */ -#define SigIeOperatingMode (0x003d) +#define SigIeOperatingMode (0x0042) static const tTLVDefn TLVS_P2PAssocReq[] = { @@ -3663,7 +3887,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_req. */ -#define SigIeP2PAssocReq (0x003e) +#define SigIeP2PAssocReq (0x0043) static const tTLVDefn TLVS_P2PAssocRes[] = { @@ -3691,7 +3915,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_res. */ -#define SigIeP2PAssocRes (0x003f) +#define SigIeP2PAssocRes (0x0044) static const tTLVDefn TLVS_P2PBeacon[] = { @@ -3722,7 +3946,7 @@ uint32_t dot11f_unpack_ie_p2_p_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_beacon. */ -#define SigIeP2PBeacon (0x0040) +#define SigIeP2PBeacon (0x0045) static const tTLVDefn TLVS_P2PBeaconProbeRes[] = { @@ -3763,7 +3987,7 @@ uint32_t dot11f_unpack_ie_p2_p_beacon_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_beacon_probe_res. */ -#define SigIeP2PBeaconProbeRes (0x0041) +#define SigIeP2PBeaconProbeRes (0x0046) static const tTLVDefn TLVS_P2PDeAuth[] = { @@ -3788,7 +4012,7 @@ uint32_t dot11f_unpack_ie_p2_p_de_auth(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_de_auth. */ -#define SigIeP2PDeAuth (0x0042) +#define SigIeP2PDeAuth (0x0047) static const tTLVDefn TLVS_P2PDisAssoc[] = { @@ -3813,7 +4037,7 @@ uint32_t dot11f_unpack_ie_p2_p_dis_assoc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_dis_assoc. */ -#define SigIeP2PDisAssoc (0x0043) +#define SigIeP2PDisAssoc (0x0048) uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, @@ -3837,7 +4061,7 @@ uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_pie_opaque. */ -#define SigIeP2PIEOpaque (0x0044) +#define SigIeP2PIEOpaque (0x0049) static const tTLVDefn TLVS_P2PProbeReq[] = { @@ -3875,7 +4099,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_req. */ -#define SigIeP2PProbeReq (0x0045) +#define SigIeP2PProbeReq (0x004a) static const tTLVDefn TLVS_P2PProbeRes[] = { @@ -3913,7 +4137,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_res. */ -#define SigIeP2PProbeRes (0x0046) +#define SigIeP2PProbeRes (0x004b) uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, @@ -3934,7 +4158,7 @@ uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_pti_control. */ -#define SigIePTIControl (0x0047) +#define SigIePTIControl (0x004c) uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, @@ -3943,22 +4167,22 @@ uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, tDot11fIEPUBufferStatus *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp51__; + uint8_t tmp53__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp51__ = *pBuf; - pDst->ac_bk_traffic_aval = tmp51__ >> 0 & 0x1; - pDst->ac_be_traffic_aval = tmp51__ >> 1 & 0x1; - pDst->ac_vi_traffic_aval = tmp51__ >> 2 & 0x1; - pDst->ac_vo_traffic_aval = tmp51__ >> 3 & 0x1; - pDst->reserved = tmp51__ >> 4 & 0xf; + tmp53__ = *pBuf; + pDst->ac_bk_traffic_aval = tmp53__ >> 0 & 0x1; + pDst->ac_be_traffic_aval = tmp53__ >> 1 & 0x1; + pDst->ac_vi_traffic_aval = tmp53__ >> 2 & 0x1; + pDst->ac_vo_traffic_aval = tmp53__ >> 3 & 0x1; + pDst->reserved = tmp53__ >> 4 & 0xf; (void)pCtx; return status; } /* End dot11f_unpack_ie_pu_buffer_status. */ -#define SigIePUBufferStatus (0x0048) +#define SigIePUBufferStatus (0x004d) uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, @@ -3979,7 +4203,7 @@ uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_caps. */ -#define SigIePowerCaps (0x0049) +#define SigIePowerCaps (0x004e) uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, @@ -3997,7 +4221,7 @@ uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_constraints. */ -#define SigIePowerConstraints (0x004a) +#define SigIePowerConstraints (0x004f) uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, @@ -4021,7 +4245,7 @@ uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qbss_load. */ -#define SigIeQBSSLoad (0x004b) +#define SigIeQBSSLoad (0x0050) uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, @@ -4042,7 +4266,7 @@ uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_QComVendorIE. */ -#define SigIeQComVendorIE (0x004c) +#define SigIeQComVendorIE (0x0051) uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, @@ -4051,22 +4275,22 @@ uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, tDot11fIEQOSCapsAp *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp52__; + uint8_t tmp54__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp52__ = *pBuf; - pDst->count = tmp52__ >> 0 & 0xf; - pDst->qack = tmp52__ >> 4 & 0x1; - pDst->qreq = tmp52__ >> 5 & 0x1; - pDst->txopreq = tmp52__ >> 6 & 0x1; - pDst->reserved = tmp52__ >> 7 & 0x1; + tmp54__ = *pBuf; + pDst->count = tmp54__ >> 0 & 0xf; + pDst->qack = tmp54__ >> 4 & 0x1; + pDst->qreq = tmp54__ >> 5 & 0x1; + pDst->txopreq = tmp54__ >> 6 & 0x1; + pDst->reserved = tmp54__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_qos_caps_ap. */ -#define SigIeQOSCapsAp (0x004d) +#define SigIeQOSCapsAp (0x0052) uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, @@ -4075,24 +4299,24 @@ uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, tDot11fIEQOSCapsStation *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp53__; + uint8_t tmp55__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp53__ = *pBuf; - pDst->acvo_uapsd = tmp53__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp53__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp53__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp53__ >> 3 & 0x1; - pDst->qack = tmp53__ >> 4 & 0x1; - pDst->max_sp_length = tmp53__ >> 5 & 0x3; - pDst->more_data_ack = tmp53__ >> 7 & 0x1; + tmp55__ = *pBuf; + pDst->acvo_uapsd = tmp55__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp55__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp55__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp55__ >> 3 & 0x1; + pDst->qack = tmp55__ >> 4 & 0x1; + pDst->max_sp_length = tmp55__ >> 5 & 0x3; + pDst->more_data_ack = tmp55__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_qos_caps_station. */ -#define SigIeQOSCapsStation (0x004e) +#define SigIeQOSCapsStation (0x0053) uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, @@ -4116,7 +4340,7 @@ uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qos_map_set. */ -#define SigIeQosMapSet (0x004f) +#define SigIeQosMapSet (0x0054) uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, @@ -4143,7 +4367,7 @@ uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_quiet. */ -#define SigIeQuiet (0x0050) +#define SigIeQuiet (0x0055) uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, @@ -4161,7 +4385,7 @@ uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rcpiie. */ -#define SigIeRCPIIE (0x0051) +#define SigIeRCPIIE (0x0056) static const tFFDefn FFS_RICDataDesc[] = { @@ -4235,7 +4459,7 @@ uint32_t dot11f_unpack_ie_ric_data_desc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_data_desc. */ -#define SigIeRICDataDesc (0x0052) +#define SigIeRICDataDesc (0x0057) uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, @@ -4326,7 +4550,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn. */ -#define SigIeRSN (0x0053) +#define SigIeRSN (0x0058) uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, @@ -4344,7 +4568,7 @@ uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsniie. */ -#define SigIeRSNIIE (0x0054) +#define SigIeRSNIIE (0x0059) uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, @@ -4368,7 +4592,7 @@ uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn_opaque. */ -#define SigIeRSNOpaque (0x0055) +#define SigIeRSNOpaque (0x005a) uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, @@ -4392,7 +4616,7 @@ uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_channels. */ -#define SigIeSuppChannels (0x0056) +#define SigIeSuppChannels (0x005b) uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, @@ -4416,7 +4640,7 @@ uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_operating_classes. */ -#define SigIeSuppOperatingClasses (0x0057) +#define SigIeSuppOperatingClasses (0x005c) uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, @@ -4448,7 +4672,7 @@ uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_rates. */ -#define SigIeSuppRates (0x0058) +#define SigIeSuppRates (0x005d) uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, @@ -4481,7 +4705,7 @@ uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tim. */ -#define SigIeTIM (0x0059) +#define SigIeTIM (0x005e) uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, @@ -4502,7 +4726,7 @@ uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_report. */ -#define SigIeTPCReport (0x005a) +#define SigIeTPCReport (0x005f) uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, @@ -4519,7 +4743,7 @@ uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_request. */ -#define SigIeTPCRequest (0x005b) +#define SigIeTPCRequest (0x0060) uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, @@ -4543,7 +4767,7 @@ uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_time_advertisement. */ -#define SigIeTimeAdvertisement (0x005c) +#define SigIeTimeAdvertisement (0x0061) uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, @@ -4564,7 +4788,7 @@ uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_timeout_interval. */ -#define SigIeTimeoutInterval (0x005d) +#define SigIeTimeoutInterval (0x0062) uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, @@ -4594,7 +4818,7 @@ uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vht_ext_bss_load. */ -#define SigIeVHTExtBssLoad (0x005e) +#define SigIeVHTExtBssLoad (0x0063) uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, @@ -4611,7 +4835,7 @@ uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor1_ie. */ -#define SigIeVendor1IE (0x005f) +#define SigIeVendor1IE (0x0064) uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, @@ -4628,7 +4852,7 @@ uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor3_ie. */ -#define SigIeVendor3IE (0x0060) +#define SigIeVendor3IE (0x0065) uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, @@ -4637,7 +4861,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, tDot11fIEWAPI *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp54__; + uint16_t tmp56__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4674,11 +4898,11 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pDst->multicast_cipher_suite, pBuf, 4); pBuf += 4; ielen -= (uint8_t)4; - framesntohs(pCtx, &tmp54__, pBuf, 0); + framesntohs(pCtx, &tmp56__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->preauth = tmp54__ >> 0 & 0x1; - pDst->reserved = tmp54__ >> 1 & 0x7fff; + pDst->preauth = tmp56__ >> 0 & 0x1; + pDst->reserved = tmp56__ >> 1 & 0x7fff; if (!ielen) { pDst->bkid_count = 0U; return 0U; @@ -4697,7 +4921,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi. */ -#define SigIeWAPI (0x0061) +#define SigIeWAPI (0x0066) uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, @@ -4721,7 +4945,7 @@ uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi_opaque. */ -#define SigIeWAPIOpaque (0x0062) +#define SigIeWAPIOpaque (0x0067) uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, @@ -4742,7 +4966,7 @@ uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfatpc. */ -#define SigIeWFATPC (0x0063) +#define SigIeWFATPC (0x0068) uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, @@ -4766,7 +4990,7 @@ uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfdie_opaque. */ -#define SigIeWFDIEOpaque (0x0064) +#define SigIeWFDIEOpaque (0x0069) uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, @@ -4775,7 +4999,7 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, tDot11fIEWMMCaps *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp55__; + uint8_t tmp57__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4787,17 +5011,17 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, pDst->present = 0; return status | DOT11F_BAD_FIXED_VALUE; } - tmp55__ = *pBuf; - pDst->reserved = tmp55__ >> 0 & 0xf; - pDst->qack = tmp55__ >> 4 & 0x1; - pDst->queue_request = tmp55__ >> 5 & 0x1; - pDst->txop_request = tmp55__ >> 6 & 0x1; - pDst->more_ack = tmp55__ >> 7 & 0x1; + tmp57__ = *pBuf; + pDst->reserved = tmp57__ >> 0 & 0xf; + pDst->qack = tmp57__ >> 4 & 0x1; + pDst->queue_request = tmp57__ >> 5 & 0x1; + pDst->txop_request = tmp57__ >> 6 & 0x1; + pDst->more_ack = tmp57__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_caps. */ -#define SigIeWMMCaps (0x0065) +#define SigIeWMMCaps (0x006a) uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, @@ -4806,7 +5030,7 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, tDot11fIEWMMInfoAp *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp56__; + uint8_t tmp58__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4814,15 +5038,15 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, pDst->version = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp56__ = *pBuf; - pDst->param_set_count = tmp56__ >> 0 & 0xf; - pDst->reserved = tmp56__ >> 4 & 0x7; - pDst->uapsd = tmp56__ >> 7 & 0x1; + tmp58__ = *pBuf; + pDst->param_set_count = tmp58__ >> 0 & 0xf; + pDst->reserved = tmp58__ >> 4 & 0x7; + pDst->uapsd = tmp58__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_info_ap. */ -#define SigIeWMMInfoAp (0x0066) +#define SigIeWMMInfoAp (0x006b) uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, @@ -4831,7 +5055,7 @@ uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, tDot11fIEWMMInfoStation *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp57__; + uint8_t tmp59__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4839,19 +5063,19 @@ uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, pDst->version = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp57__ = *pBuf; - pDst->acvo_uapsd = tmp57__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp57__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp57__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp57__ >> 3 & 0x1; - pDst->reserved1 = tmp57__ >> 4 & 0x1; - pDst->max_sp_length = tmp57__ >> 5 & 0x3; - pDst->reserved2 = tmp57__ >> 7 & 0x1; + tmp59__ = *pBuf; + pDst->acvo_uapsd = tmp59__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp59__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp59__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp59__ >> 3 & 0x1; + pDst->reserved1 = tmp59__ >> 4 & 0x1; + pDst->max_sp_length = tmp59__ >> 5 & 0x3; + pDst->reserved2 = tmp59__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_info_station. */ -#define SigIeWMMInfoStation (0x0067) +#define SigIeWMMInfoStation (0x006c) uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, @@ -4860,14 +5084,14 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, tDot11fIEWMMParams *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp58__; - uint8_t tmp59__; uint8_t tmp60__; uint8_t tmp61__; uint8_t tmp62__; uint8_t tmp63__; uint8_t tmp64__; uint8_t tmp65__; + uint8_t tmp66__; + uint8_t tmp67__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4885,69 +5109,69 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, pDst->reserved2 = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp58__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_aifsn = tmp58__ >> 0 & 0xf; - pDst->acbe_acm = tmp58__ >> 4 & 0x1; - pDst->acbe_aci = tmp58__ >> 5 & 0x3; - pDst->unused1 = tmp58__ >> 7 & 0x1; - tmp59__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_acwmin = tmp59__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp59__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); - pBuf += 2; - ielen -= (uint8_t)2; tmp60__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp60__ >> 0 & 0xf; - pDst->acbk_acm = tmp60__ >> 4 & 0x1; - pDst->acbk_aci = tmp60__ >> 5 & 0x3; - pDst->unused2 = tmp60__ >> 7 & 0x1; + pDst->acbe_aifsn = tmp60__ >> 0 & 0xf; + pDst->acbe_acm = tmp60__ >> 4 & 0x1; + pDst->acbe_aci = tmp60__ >> 5 & 0x3; + pDst->unused1 = tmp60__ >> 7 & 0x1; tmp61__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp61__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp61__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); + pDst->acbe_acwmin = tmp61__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp61__ >> 4 & 0xf; + framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; tmp62__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp62__ >> 0 & 0xf; - pDst->acvi_acm = tmp62__ >> 4 & 0x1; - pDst->acvi_aci = tmp62__ >> 5 & 0x3; - pDst->unused3 = tmp62__ >> 7 & 0x1; + pDst->acbk_aifsn = tmp62__ >> 0 & 0xf; + pDst->acbk_acm = tmp62__ >> 4 & 0x1; + pDst->acbk_aci = tmp62__ >> 5 & 0x3; + pDst->unused2 = tmp62__ >> 7 & 0x1; tmp63__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp63__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp63__ >> 4 & 0xf; - framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); + pDst->acbk_acwmin = tmp63__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp63__ >> 4 & 0xf; + framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; tmp64__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp64__ >> 0 & 0xf; - pDst->acvo_acm = tmp64__ >> 4 & 0x1; - pDst->acvo_aci = tmp64__ >> 5 & 0x3; - pDst->unused4 = tmp64__ >> 7 & 0x1; + pDst->acvi_aifsn = tmp64__ >> 0 & 0xf; + pDst->acvi_acm = tmp64__ >> 4 & 0x1; + pDst->acvi_aci = tmp64__ >> 5 & 0x3; + pDst->unused3 = tmp64__ >> 7 & 0x1; tmp65__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp65__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp65__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp65__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp65__ >> 4 & 0xf; + framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + tmp66__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_aifsn = tmp66__ >> 0 & 0xf; + pDst->acvo_acm = tmp66__ >> 4 & 0x1; + pDst->acvo_aci = tmp66__ >> 5 & 0x3; + pDst->unused4 = tmp66__ >> 7 & 0x1; + tmp67__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_acwmin = tmp67__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp67__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_params. */ -#define SigIeWMMParams (0x0068) +#define SigIeWMMParams (0x006d) uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, @@ -5020,7 +5244,7 @@ uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa. */ -#define SigIeWPA (0x0069) +#define SigIeWPA (0x006e) uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, @@ -5044,7 +5268,7 @@ uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa_opaque. */ -#define SigIeWPAOpaque (0x006a) +#define SigIeWPAOpaque (0x006f) static const tTLVDefn TLVS_WSC[] = { @@ -5134,7 +5358,7 @@ uint32_t dot11f_unpack_ie_wsc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc. */ -#define SigIeWSC (0x006b) +#define SigIeWSC (0x0070) static const tTLVDefn TLVS_WscAssocReq[] = { @@ -5165,7 +5389,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_req. */ -#define SigIeWscAssocReq (0x006c) +#define SigIeWscAssocReq (0x0071) static const tTLVDefn TLVS_WscAssocRes[] = { @@ -5196,7 +5420,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_res. */ -#define SigIeWscAssocRes (0x006d) +#define SigIeWscAssocRes (0x0072) static const tTLVDefn TLVS_WscBeacon[] = { @@ -5248,7 +5472,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon. */ -#define SigIeWscBeacon (0x006e) +#define SigIeWscBeacon (0x0073) static const tTLVDefn TLVS_WscBeaconProbeRes[] = { @@ -5325,7 +5549,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon_probe_res. */ -#define SigIeWscBeaconProbeRes (0x006f) +#define SigIeWscBeaconProbeRes (0x0074) uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, @@ -5349,7 +5573,7 @@ uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_ie_opaque. */ -#define SigIeWscIEOpaque (0x0070) +#define SigIeWscIEOpaque (0x0075) static const tTLVDefn TLVS_WscProbeReq[] = { @@ -5421,7 +5645,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_req. */ -#define SigIeWscProbeReq (0x0071) +#define SigIeWscProbeReq (0x0076) static const tTLVDefn TLVS_WscProbeRes[] = { @@ -5498,7 +5722,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_res. */ -#define SigIeWscProbeRes (0x0072) +#define SigIeWscProbeRes (0x0077) static const tTLVDefn TLVS_WscReassocRes[] = { @@ -5529,7 +5753,7 @@ uint32_t dot11f_unpack_ie_wsc_reassoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_reassoc_res. */ -#define SigIeWscReassocRes (0x0073) +#define SigIeWscReassocRes (0x0078) uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, @@ -5556,7 +5780,7 @@ uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ext_chan_switch_ann. */ -#define SigIeext_chan_switch_ann (0x0074) +#define SigIeext_chan_switch_ann (0x0079) uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, @@ -5565,23 +5789,23 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, tDot11fIEht2040_bss_coexistence *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp66__; + uint8_t tmp68__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp66__ = *pBuf; - pDst->info_request = tmp66__ >> 0 & 0x1; - pDst->forty_mhz_intolerant = tmp66__ >> 1 & 0x1; - pDst->twenty_mhz_bsswidth_req = tmp66__ >> 2 & 0x1; - pDst->obss_scan_exemption_req = tmp66__ >> 3 & 0x1; - pDst->obss_scan_exemption_grant = tmp66__ >> 4 & 0x1; - pDst->unused = tmp66__ >> 5 & 0x7; + tmp68__ = *pBuf; + pDst->info_request = tmp68__ >> 0 & 0x1; + pDst->forty_mhz_intolerant = tmp68__ >> 1 & 0x1; + pDst->twenty_mhz_bsswidth_req = tmp68__ >> 2 & 0x1; + pDst->obss_scan_exemption_req = tmp68__ >> 3 & 0x1; + pDst->obss_scan_exemption_grant = tmp68__ >> 4 & 0x1; + pDst->unused = tmp68__ >> 5 & 0x7; (void)pCtx; return status; } /* End dot11f_unpack_ie_ht2040_bss_coexistence. */ -#define SigIeht2040_bss_coexistence (0x0075) +#define SigIeht2040_bss_coexistence (0x007a) uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, @@ -5608,7 +5832,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht2040_bss_intolerant_report. */ -#define SigIeht2040_bss_intolerant_report (0x0076) +#define SigIeht2040_bss_intolerant_report (0x007b) uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, @@ -5626,7 +5850,7 @@ uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_sec_chan_offset_ele. */ -#define SigIesec_chan_offset_ele (0x0077) +#define SigIesec_chan_offset_ele (0x007c) static const tFFDefn FFS_vendor2_ie[] = { @@ -5671,7 +5895,7 @@ uint32_t dot11f_unpack_ie_vendor2_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor2_ie. */ -#define SigIevendor2_ie (0x0078) +#define SigIevendor2_ie (0x007d) static const tFFDefn FFS_AddTSRequest[] = { @@ -6906,8 +7130,8 @@ static const tIEDefn IES_MeasurementRequest[] = { { offsetof(tDot11fMeasurementRequest, MeasurementRequest), offsetof(tDot11fIEMeasurementRequest, present), offsetof(tDot11fMeasurementRequest, num_MeasurementRequest), - "MeasurementRequest", 4, 16, 18, SigIeMeasurementRequest, - {0, 0, 0, 0, 0}, 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, + "MeasurementRequest", 4, 6, 18, SigIeMeasurementRequest, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; uint32_t dot11f_unpack_measurement_request(tpAniSirGlobal pCtx, @@ -7346,8 +7570,8 @@ static const tIEDefn IES_RadioMeasurementRequest[] = { { offsetof(tDot11fRadioMeasurementRequest, MeasurementRequest), offsetof(tDot11fIEMeasurementRequest, present), offsetof(tDot11fRadioMeasurementRequest, num_MeasurementRequest), - "MeasurementRequest", 2, 16, 18, SigIeMeasurementRequest, - {0, 0, 0, 0, 0}, 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, + "MeasurementRequest", 2, 6, 18, SigIeMeasurementRequest, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; uint32_t dot11f_unpack_radio_measurement_request(tpAniSirGlobal pCtx, @@ -8771,15 +8995,6 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, countOffset = ((0 != pIe->arraybound) * (*(uint16_t *)(pFrm + pIe->countOffset))); switch (pIe->sig) { - case SigIeCondensedCountryStr: - status |= - dot11f_unpack_ie_condensed_country_str( - pCtx, pBufRemaining, len, - (tDot11fIECondensedCountryStr *) - (pFrm + pIe->offset + - sizeof(tDot11fIECondensedCountryStr) * - countOffset)); - break; case SigIeGTK: status |= dot11f_unpack_ie_gtk( @@ -8816,15 +9031,6 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIER1KH_ID) * countOffset)); break; - case SigIeTSFInfo: - status |= - dot11f_unpack_ie_tsf_info( - pCtx, pBufRemaining, len, - (tDot11fIETSFInfo *) - (pFrm + pIe->offset + - sizeof(tDot11fIETSFInfo) * - countOffset)); - break; case SigIeAPChannelReport: status |= dot11f_unpack_ie_ap_channel_report( @@ -8861,6 +9067,15 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEBeaconReporting) * countOffset)); break; + case SigIeCondensedCountryStr: + status |= + dot11f_unpack_ie_condensed_country_str( + pCtx, pBufRemaining, len, + (tDot11fIECondensedCountryStr *) + (pFrm + pIe->offset + + sizeof(tDot11fIECondensedCountryStr) * + countOffset)); + break; case SigIeMeasurementPilot: status |= dot11f_unpack_ie_measurement_pilot( @@ -8956,6 +9171,15 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIETSDelay) * countOffset)); break; + case SigIeTSFInfo: + status |= + dot11f_unpack_ie_tsf_info( + pCtx, pBufRemaining, len, + (tDot11fIETSFInfo *) + (pFrm + pIe->offset + + sizeof(tDot11fIETSFInfo) * + countOffset)); + break; case SigIeTSPEC: status |= dot11f_unpack_ie_tspec( @@ -9037,6 +9261,51 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEWiderBWChanSwitchAnn) * countOffset)); break; + case SigIeazimuth_req: + status |= + dot11f_unpack_ie_azimuth_req( + pCtx, pBufRemaining, len, + (tDot11fIEazimuth_req *) + (pFrm + pIe->offset + + sizeof(tDot11fIEazimuth_req) * + countOffset)); + break; + case SigIemax_age: + status |= + dot11f_unpack_ie_max_age( + pCtx, pBufRemaining, len, + (tDot11fIEmax_age *) + (pFrm + pIe->offset + + sizeof(tDot11fIEmax_age) * + countOffset)); + break; + case SigIeneighbor_rpt: + status |= + dot11f_unpack_ie_neighbor_rpt( + pCtx, pBufRemaining, len, + (tDot11fIEneighbor_rpt *) + (pFrm + pIe->offset + + sizeof(tDot11fIEneighbor_rpt) * + countOffset)); + break; + case SigIereq_mac_addr: + status |= + dot11f_unpack_ie_req_mac_addr( + pCtx, pBufRemaining, len, + (tDot11fIEreq_mac_addr *) + (pFrm + pIe->offset + + sizeof(tDot11fIEreq_mac_addr) * + countOffset)); + break; + case SigIetgt_mac_addr: + status |= + dot11f_unpack_ie_tgt_mac_addr( + pCtx, pBufRemaining, len, + (tDot11fIEtgt_mac_addr *) + (pFrm + pIe->offset + + sizeof(tDot11fIEtgt_mac_addr) * + countOffset)); + break; case SigIeAID: status |= dot11f_unpack_ie_aid( @@ -10489,6 +10758,26 @@ uint32_t dot11f_get_packed_iewmmtclas(tpAniSirGlobal pCtx, return status; } /* End dot11f_get_packed_iewmmtclas. */ +uint32_t dot11f_get_packed_ie_neighbor_rpt(tpAniSirGlobal pCtx, + tDot11fIEneighbor_rpt *pIe, uint32_t *pnNeeded) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void)pCtx; + while (pIe->present) { + *pnNeeded += 6; + *pnNeeded += 1; + *pnNeeded += 1; + *pnNeeded += 2; + *pnNeeded += 1; + *pnNeeded += 1; + *pnNeeded += 1; + status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, + IES_neighbor_rpt); + break; + } + return status; +} /* End dot11f_get_packed_ie_neighbor_rpt. */ + uint32_t dot11f_get_packed_ie_channel_switch_wrapper(tpAniSirGlobal pCtx, tDot11fIEChannelSwitchWrapper *pIe, uint32_t *pnNeeded) { @@ -10628,6 +10917,15 @@ uint32_t dot11f_get_packed_ie_measurement_request(tpAniSirGlobal pCtx, *pnNeeded += 6; status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, IES_measurement_requestBeacon); break; + case 8: + *pnNeeded += 1; + status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, IES_measurement_requestlci); + break; + case 16: + *pnNeeded += 2; + *pnNeeded += 1; + status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, IES_measurement_requestftmrr); + break; } break; } @@ -11489,13 +11787,6 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, *pnNeeded += 2U + pIe->noui; byteCount = 0; switch (pIe->sig) { - case SigIeCondensedCountryStr: - offset = sizeof(tDot11fIECondensedCountryStr); - byteCount = 2; - pIePresent = ((tDot11fIECondensedCountryStr *) - (pFrm + pIe->offset + offset * i))-> - present; - break; case SigIeGTK: offset = sizeof(tDot11fIEGTK); byteCount = ((tDot11fIEGTK *) @@ -11528,13 +11819,6 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; - case SigIeTSFInfo: - offset = sizeof(tDot11fIETSFInfo); - byteCount = 4; - pIePresent = ((tDot11fIETSFInfo *) - (pFrm + pIe->offset + offset * i))-> - present; - break; case SigIeAPChannelReport: offset = sizeof(tDot11fIEAPChannelReport); byteCount = ((tDot11fIEAPChannelReport *) @@ -11567,6 +11851,13 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; + case SigIeCondensedCountryStr: + offset = sizeof(tDot11fIECondensedCountryStr); + byteCount = 2; + pIePresent = ((tDot11fIECondensedCountryStr *) + (pFrm + pIe->offset + offset * i))-> + present; + break; case SigIeMeasurementPilot: offset = sizeof(tDot11fIEMeasurementPilot); byteCount = ((tDot11fIEMeasurementPilot *) @@ -11655,6 +11946,13 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; + case SigIeTSFInfo: + offset = sizeof(tDot11fIETSFInfo); + byteCount = 4; + pIePresent = ((tDot11fIETSFInfo *) + (pFrm + pIe->offset + offset * i))-> + present; + break; case SigIeTSPEC: offset = sizeof(tDot11fIETSPEC); byteCount = 55; @@ -11719,6 +12017,42 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; + case SigIeazimuth_req: + offset = sizeof(tDot11fIEazimuth_req); + byteCount = 1; + pIePresent = ((tDot11fIEazimuth_req *) + (pFrm + pIe->offset + offset * i))-> + present; + break; + case SigIemax_age: + offset = sizeof(tDot11fIEmax_age); + byteCount = 2; + pIePresent = ((tDot11fIEmax_age *) + (pFrm + pIe->offset + offset * i))-> + present; + break; + case SigIeneighbor_rpt: + offset = sizeof(tDot11fIEneighbor_rpt); + status |= + dot11f_get_packed_ie_neighbor_rpt( + pCtx, (tDot11fIEneighbor_rpt *) + (pFrm + pIe->offset + offset * i), + pnNeeded); + break; + case SigIereq_mac_addr: + offset = sizeof(tDot11fIEreq_mac_addr); + byteCount = 6; + pIePresent = ((tDot11fIEreq_mac_addr *) + (pFrm + pIe->offset + offset * i))-> + present; + break; + case SigIetgt_mac_addr: + offset = sizeof(tDot11fIEtgt_mac_addr); + byteCount = 6; + pIePresent = ((tDot11fIEtgt_mac_addr *) + (pFrm + pIe->offset + offset * i))-> + present; + break; case SigIeAID: offset = sizeof(tDot11fIEAID); byteCount = 2; @@ -12701,25 +13035,25 @@ void dot11f_pack_ff_capabilities(tpAniSirGlobal pCtx, tDot11fFfCapabilities *pSrc, uint8_t *pBuf) { - uint16_t tmp67__; - tmp67__ = 0U; - tmp67__ |= (pSrc->ess << 0); - tmp67__ |= (pSrc->ibss << 1); - tmp67__ |= (pSrc->cfPollable << 2); - tmp67__ |= (pSrc->cfPollReq << 3); - tmp67__ |= (pSrc->privacy << 4); - tmp67__ |= (pSrc->shortPreamble << 5); - tmp67__ |= (pSrc->pbcc << 6); - tmp67__ |= (pSrc->channelAgility << 7); - tmp67__ |= (pSrc->spectrumMgt << 8); - tmp67__ |= (pSrc->qos << 9); - tmp67__ |= (pSrc->shortSlotTime << 10); - tmp67__ |= (pSrc->apsd << 11); - tmp67__ |= (pSrc->rrm << 12); - tmp67__ |= (pSrc->dsssOfdm << 13); - tmp67__ |= (pSrc->delayedBA << 14); - tmp67__ |= (pSrc->immediateBA << 15); - frameshtons(pCtx, pBuf, tmp67__, 0); + uint16_t tmp69__; + tmp69__ = 0U; + tmp69__ |= (pSrc->ess << 0); + tmp69__ |= (pSrc->ibss << 1); + tmp69__ |= (pSrc->cfPollable << 2); + tmp69__ |= (pSrc->cfPollReq << 3); + tmp69__ |= (pSrc->privacy << 4); + tmp69__ |= (pSrc->shortPreamble << 5); + tmp69__ |= (pSrc->pbcc << 6); + tmp69__ |= (pSrc->channelAgility << 7); + tmp69__ |= (pSrc->spectrumMgt << 8); + tmp69__ |= (pSrc->qos << 9); + tmp69__ |= (pSrc->shortSlotTime << 10); + tmp69__ |= (pSrc->apsd << 11); + tmp69__ |= (pSrc->rrm << 12); + tmp69__ |= (pSrc->dsssOfdm << 13); + tmp69__ |= (pSrc->delayedBA << 14); + tmp69__ |= (pSrc->immediateBA << 15); + frameshtons(pCtx, pBuf, tmp69__, 0); (void)pCtx; } /* End dot11f_pack_ff_capabilities. */ @@ -12783,13 +13117,13 @@ void dot11f_pack_ff_operating_mode(tpAniSirGlobal pCtx, tDot11fFfOperatingMode *pSrc, uint8_t *pBuf) { - uint8_t tmp68__; - tmp68__ = 0U; - tmp68__ |= (pSrc->chanWidth << 0); - tmp68__ |= (pSrc->reserved << 2); - tmp68__ |= (pSrc->rxNSS << 4); - tmp68__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp68__; + uint8_t tmp70__; + tmp70__ = 0U; + tmp70__ |= (pSrc->chanWidth << 0); + tmp70__ |= (pSrc->reserved << 2); + tmp70__ |= (pSrc->rxNSS << 4); + tmp70__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp70__; (void)pCtx; } /* End dot11f_pack_ff_operating_mode. */ @@ -12829,12 +13163,12 @@ void dot11f_pack_ff_sm_power_mode_set(tpAniSirGlobal pCtx, tDot11fFfSMPowerModeSet *pSrc, uint8_t *pBuf) { - uint8_t tmp69__; - tmp69__ = 0U; - tmp69__ |= (pSrc->PowerSave_En << 0); - tmp69__ |= (pSrc->Mode << 1); - tmp69__ |= (pSrc->reserved << 2); - *pBuf = tmp69__; + uint8_t tmp71__; + tmp71__ = 0U; + tmp71__ |= (pSrc->PowerSave_En << 0); + tmp71__ |= (pSrc->Mode << 1); + tmp71__ |= (pSrc->reserved << 2); + *pBuf = tmp71__; (void)pCtx; } /* End dot11f_pack_ff_sm_power_mode_set. */ @@ -12874,19 +13208,19 @@ void dot11f_pack_ff_ts_info(tpAniSirGlobal pCtx, tDot11fFfTSInfo *pSrc, uint8_t *pBuf) { - uint32_t tmp70__; - tmp70__ = 0U; - tmp70__ |= (pSrc->traffic_type << 0); - tmp70__ |= (pSrc->tsid << 1); - tmp70__ |= (pSrc->direction << 5); - tmp70__ |= (pSrc->access_policy << 7); - tmp70__ |= (pSrc->aggregation << 9); - tmp70__ |= (pSrc->psb << 10); - tmp70__ |= (pSrc->user_priority << 11); - tmp70__ |= (pSrc->tsinfo_ack_pol << 14); - tmp70__ |= (pSrc->schedule << 16); - tmp70__ |= (pSrc->unused << 17); - frameshtonl(pCtx, pBuf, tmp70__, 0); + uint32_t tmp72__; + tmp72__ = 0U; + tmp72__ |= (pSrc->traffic_type << 0); + tmp72__ |= (pSrc->tsid << 1); + tmp72__ |= (pSrc->direction << 5); + tmp72__ |= (pSrc->access_policy << 7); + tmp72__ |= (pSrc->aggregation << 9); + tmp72__ |= (pSrc->psb << 10); + tmp72__ |= (pSrc->user_priority << 11); + tmp72__ |= (pSrc->tsinfo_ack_pol << 14); + tmp72__ |= (pSrc->schedule << 16); + tmp72__ |= (pSrc->unused << 17); + frameshtonl(pCtx, pBuf, tmp72__, 0); (void)pCtx; } /* End dot11f_pack_ff_ts_info. */ @@ -12942,13 +13276,13 @@ void dot11f_pack_ff_ext_chan_switch_ann_action(tpAniSirGlobal pCtx, tDot11fFfext_chan_switch_ann_action *pSrc, uint8_t *pBuf) { - uint32_t tmp71__; - tmp71__ = 0U; - tmp71__ |= (pSrc->switch_mode << 0); - tmp71__ |= (pSrc->op_class << 8); - tmp71__ |= (pSrc->new_channel << 16); - tmp71__ |= (pSrc->switch_count << 24); - frameshtonl(pCtx, pBuf, tmp71__, 0); + uint32_t tmp73__; + tmp73__ = 0U; + tmp73__ |= (pSrc->switch_mode << 0); + tmp73__ |= (pSrc->op_class << 8); + tmp73__ |= (pSrc->new_channel << 16); + tmp73__ |= (pSrc->switch_count << 24); + frameshtonl(pCtx, pBuf, tmp73__, 0); (void)pCtx; } /* End dot11f_pack_ff_ext_chan_switch_ann_action. */ @@ -13019,7 +13353,7 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp72__; + uint8_t tmp74__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -13028,10 +13362,10 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp72__ = 0U; - tmp72__ |= (pSrc->minor << 0); - tmp72__ |= (pSrc->major << 4); - *pBuf = tmp72__; + tmp74__ = 0U; + tmp74__ |= (pSrc->minor << 0); + tmp74__ |= (pSrc->major << 4); + *pBuf = tmp74__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -13988,7 +14322,7 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp73__; + uint8_t tmp75__; nNeeded += 5; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -13997,10 +14331,10 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, pBuf += 2; *pnConsumed += 2; pTlvLen = pBuf; pBuf += 2; *pnConsumed += 2; - tmp73__ = 0U; - tmp73__ |= (pSrc->minor << 0); - tmp73__ |= (pSrc->major << 4); - *pBuf = tmp73__; + tmp75__ = 0U; + tmp75__ |= (pSrc->minor << 0); + tmp75__ |= (pSrc->major << 4); + *pBuf = tmp75__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -14100,35 +14434,6 @@ uint32_t dot11f_pack_tlv_p2_p_manageability(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_tlv_p2_p_manageability. */ -uint32_t dot11f_pack_ie_condensed_country_str(tpAniSirGlobal pCtx, - tDot11fIECondensedCountryStr *pSrc, - uint8_t *pBuf, - uint32_t nBuf, - uint32_t *pnConsumed) -{ - uint8_t *pIeLen = 0; - uint32_t nConsumedOnEntry = *pnConsumed; - uint32_t nNeeded = 0U; - nNeeded += 2; - while (pSrc->present) { - if (nNeeded > nBuf) - return DOT11F_BUFFER_OVERFLOW; - *pBuf = 2; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - DOT11F_MEMCPY(pCtx, pBuf, pSrc->countryStr, 2); - *pnConsumed += 2; - /* fieldsEndFlag = 1 */ - break; - } - (void)pCtx; - if (pIeLen) { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_condensed_country_str. */ - uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, tDot11fIEGTK *pSrc, uint8_t *pBuf, @@ -14138,7 +14443,7 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp74__; + uint16_t tmp76__; nNeeded += (pSrc->num_key + 11); while (pSrc->present) { if (nNeeded > nBuf) @@ -14147,10 +14452,10 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp74__ = 0U; - tmp74__ |= (pSrc->keyId << 0); - tmp74__ |= (pSrc->reserved << 2); - frameshtons(pCtx, pBuf, tmp74__, 0); + tmp76__ = 0U; + tmp76__ |= (pSrc->keyId << 0); + tmp76__ |= (pSrc->reserved << 2); + frameshtons(pCtx, pBuf, tmp76__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -14268,38 +14573,6 @@ uint32_t dot11f_pack_ie_r1_kh_id(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_r1_kh_id. */ -uint32_t dot11f_pack_ie_tsf_info(tpAniSirGlobal pCtx, - tDot11fIETSFInfo *pSrc, - uint8_t *pBuf, - uint32_t nBuf, - uint32_t *pnConsumed) -{ - uint8_t *pIeLen = 0; - uint32_t nConsumedOnEntry = *pnConsumed; - uint32_t nNeeded = 0U; - nNeeded += 4; - while (pSrc->present) { - if (nNeeded > nBuf) - return DOT11F_BUFFER_OVERFLOW; - *pBuf = 1; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - frameshtons(pCtx, pBuf, pSrc->TsfOffset, 0); - *pnConsumed += 2; - pBuf += 2; - frameshtons(pCtx, pBuf, pSrc->BeaconIntvl, 0); - *pnConsumed += 2; - /* fieldsEndFlag = 1 */ - break; - } - (void)pCtx; - if (pIeLen) { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_tsf_info. */ - uint32_t dot11f_pack_ie_ap_channel_report(tpAniSirGlobal pCtx, tDot11fIEAPChannelReport *pSrc, uint8_t *pBuf, @@ -14422,6 +14695,35 @@ uint32_t dot11f_pack_ie_beacon_reporting(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_beacon_reporting. */ +uint32_t dot11f_pack_ie_condensed_country_str(tpAniSirGlobal pCtx, + tDot11fIECondensedCountryStr *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 2; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 2; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->countryStr, 2); + *pnConsumed += 2; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_condensed_country_str. */ + uint32_t dot11f_pack_ie_measurement_pilot(tpAniSirGlobal pCtx, tDot11fIEMeasurementPilot *pSrc, uint8_t *pBuf, @@ -14562,11 +14864,11 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp75__; - uint8_t tmp76__; uint8_t tmp77__; uint8_t tmp78__; uint8_t tmp79__; + uint8_t tmp80__; + uint8_t tmp81__; nNeeded += 5; while (pSrc->present) { if (nNeeded > nBuf) @@ -14575,60 +14877,60 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp75__ = 0U; - tmp75__ |= (pSrc->LinkMeasurement << 0); - tmp75__ |= (pSrc->NeighborRpt << 1); - tmp75__ |= (pSrc->parallel << 2); - tmp75__ |= (pSrc->repeated << 3); - tmp75__ |= (pSrc->BeaconPassive << 4); - tmp75__ |= (pSrc->BeaconActive << 5); - tmp75__ |= (pSrc->BeaconTable << 6); - tmp75__ |= (pSrc->BeaconRepCond << 7); - *pBuf = tmp75__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp76__ = 0U; - tmp76__ |= (pSrc->FrameMeasurement << 0); - tmp76__ |= (pSrc->ChannelLoad << 1); - tmp76__ |= (pSrc->NoiseHistogram << 2); - tmp76__ |= (pSrc->statistics << 3); - tmp76__ |= (pSrc->LCIMeasurement << 4); - tmp76__ |= (pSrc->LCIAzimuth << 5); - tmp76__ |= (pSrc->TCMCapability << 6); - tmp76__ |= (pSrc->triggeredTCM << 7); - *pBuf = tmp76__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp77__ = 0U; - tmp77__ |= (pSrc->APChanReport << 0); - tmp77__ |= (pSrc->RRMMIBEnabled << 1); - tmp77__ |= (pSrc->operatingChanMax << 2); - tmp77__ |= (pSrc->nonOperatinChanMax << 5); + tmp77__ |= (pSrc->LinkMeasurement << 0); + tmp77__ |= (pSrc->NeighborRpt << 1); + tmp77__ |= (pSrc->parallel << 2); + tmp77__ |= (pSrc->repeated << 3); + tmp77__ |= (pSrc->BeaconPassive << 4); + tmp77__ |= (pSrc->BeaconActive << 5); + tmp77__ |= (pSrc->BeaconTable << 6); + tmp77__ |= (pSrc->BeaconRepCond << 7); *pBuf = tmp77__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp78__ = 0U; - tmp78__ |= (pSrc->MeasurementPilot << 0); - tmp78__ |= (pSrc->MeasurementPilotEnabled << 3); - tmp78__ |= (pSrc->NeighborTSFOffset << 4); - tmp78__ |= (pSrc->RCPIMeasurement << 5); - tmp78__ |= (pSrc->RSNIMeasurement << 6); - tmp78__ |= (pSrc->BssAvgAccessDelay << 7); + tmp78__ |= (pSrc->FrameMeasurement << 0); + tmp78__ |= (pSrc->ChannelLoad << 1); + tmp78__ |= (pSrc->NoiseHistogram << 2); + tmp78__ |= (pSrc->statistics << 3); + tmp78__ |= (pSrc->LCIMeasurement << 4); + tmp78__ |= (pSrc->LCIAzimuth << 5); + tmp78__ |= (pSrc->TCMCapability << 6); + tmp78__ |= (pSrc->triggeredTCM << 7); *pBuf = tmp78__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp79__ = 0U; - tmp79__ |= (pSrc->BSSAvailAdmission << 0); - tmp79__ |= (pSrc->AntennaInformation << 1); - tmp79__ |= (pSrc->fine_time_meas_rpt << 2); - tmp79__ |= (pSrc->lci_capability << 3); - tmp79__ |= (pSrc->reserved << 4); + tmp79__ |= (pSrc->APChanReport << 0); + tmp79__ |= (pSrc->RRMMIBEnabled << 1); + tmp79__ |= (pSrc->operatingChanMax << 2); + tmp79__ |= (pSrc->nonOperatinChanMax << 5); *pBuf = tmp79__; *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp80__ = 0U; + tmp80__ |= (pSrc->MeasurementPilot << 0); + tmp80__ |= (pSrc->MeasurementPilotEnabled << 3); + tmp80__ |= (pSrc->NeighborTSFOffset << 4); + tmp80__ |= (pSrc->RCPIMeasurement << 5); + tmp80__ |= (pSrc->RSNIMeasurement << 6); + tmp80__ |= (pSrc->BssAvgAccessDelay << 7); + *pBuf = tmp80__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp81__ = 0U; + tmp81__ |= (pSrc->BSSAvailAdmission << 0); + tmp81__ |= (pSrc->AntennaInformation << 1); + tmp81__ |= (pSrc->fine_time_meas_rpt << 2); + tmp81__ |= (pSrc->lci_capability << 3); + tmp81__ |= (pSrc->reserved << 4); + *pBuf = tmp81__; + *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; break; @@ -14707,7 +15009,7 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp80__; + uint16_t tmp82__; nNeeded += 14; while (pSrc->present) { if (nNeeded > nBuf) @@ -14716,12 +15018,12 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp80__ = 0U; - tmp80__ |= (pSrc->aggregation << 0); - tmp80__ |= (pSrc->tsid << 1); - tmp80__ |= (pSrc->direction << 5); - tmp80__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp80__, 0); + tmp82__ = 0U; + tmp82__ |= (pSrc->aggregation << 0); + tmp82__ |= (pSrc->tsid << 1); + tmp82__ |= (pSrc->direction << 5); + tmp82__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp82__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -14907,6 +15209,38 @@ uint32_t dot11f_pack_ie_ts_delay(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_ts_delay. */ +uint32_t dot11f_pack_ie_tsf_info(tpAniSirGlobal pCtx, + tDot11fIETSFInfo *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 4; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 1; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + frameshtons(pCtx, pBuf, pSrc->TsfOffset, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->BeaconIntvl, 0); + *pnConsumed += 2; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_tsf_info. */ + uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, tDot11fIETSPEC *pSrc, uint8_t *pBuf, @@ -14916,9 +15250,9 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp81__; - uint8_t tmp82__; uint16_t tmp83__; + uint8_t tmp84__; + uint16_t tmp85__; nNeeded += 55; while (pSrc->present) { if (nNeeded > nBuf) @@ -14927,30 +15261,30 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp81__ = 0U; - tmp81__ |= (pSrc->traffic_type << 0); - tmp81__ |= (pSrc->tsid << 1); - tmp81__ |= (pSrc->direction << 5); - tmp81__ |= (pSrc->access_policy << 7); - tmp81__ |= (pSrc->aggregation << 9); - tmp81__ |= (pSrc->psb << 10); - tmp81__ |= (pSrc->user_priority << 11); - tmp81__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp81__, 0); + tmp83__ = 0U; + tmp83__ |= (pSrc->traffic_type << 0); + tmp83__ |= (pSrc->tsid << 1); + tmp83__ |= (pSrc->direction << 5); + tmp83__ |= (pSrc->access_policy << 7); + tmp83__ |= (pSrc->aggregation << 9); + tmp83__ |= (pSrc->psb << 10); + tmp83__ |= (pSrc->user_priority << 11); + tmp83__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp83__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp82__ = 0U; - tmp82__ |= (pSrc->schedule << 0); - tmp82__ |= (pSrc->unused << 1); - *pBuf = tmp82__; + tmp84__ = 0U; + tmp84__ |= (pSrc->schedule << 0); + tmp84__ |= (pSrc->unused << 1); + *pBuf = tmp84__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp83__ = 0U; - tmp83__ |= (pSrc->size << 0); - tmp83__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp83__, 0); + tmp85__ = 0U; + tmp85__ |= (pSrc->size << 0); + tmp85__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp85__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -15014,9 +15348,9 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp84__; - uint16_t tmp85__; - uint16_t tmp86__; + uint32_t tmp86__; + uint16_t tmp87__; + uint16_t tmp88__; nNeeded += 12; while (pSrc->present) { if (nNeeded > nBuf) @@ -15025,48 +15359,48 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp84__ = 0U; - tmp84__ |= (pSrc->maxMPDULen << 0); - tmp84__ |= (pSrc->supportedChannelWidthSet << 2); - tmp84__ |= (pSrc->ldpcCodingCap << 4); - tmp84__ |= (pSrc->shortGI80MHz << 5); - tmp84__ |= (pSrc->shortGI160and80plus80MHz << 6); - tmp84__ |= (pSrc->txSTBC << 7); - tmp84__ |= (pSrc->rxSTBC << 8); - tmp84__ |= (pSrc->suBeamFormerCap << 11); - tmp84__ |= (pSrc->suBeamformeeCap << 12); - tmp84__ |= (pSrc->csnofBeamformerAntSup << 13); - tmp84__ |= (pSrc->numSoundingDim << 16); - tmp84__ |= (pSrc->muBeamformerCap << 19); - tmp84__ |= (pSrc->muBeamformeeCap << 20); - tmp84__ |= (pSrc->vhtTXOPPS << 21); - tmp84__ |= (pSrc->htcVHTCap << 22); - tmp84__ |= (pSrc->maxAMPDULenExp << 23); - tmp84__ |= (pSrc->vhtLinkAdaptCap << 26); - tmp84__ |= (pSrc->rxAntPattern << 28); - tmp84__ |= (pSrc->txAntPattern << 29); - tmp84__ |= (pSrc->reserved1 << 30); - frameshtonl(pCtx, pBuf, tmp84__, 0); + tmp86__ = 0U; + tmp86__ |= (pSrc->maxMPDULen << 0); + tmp86__ |= (pSrc->supportedChannelWidthSet << 2); + tmp86__ |= (pSrc->ldpcCodingCap << 4); + tmp86__ |= (pSrc->shortGI80MHz << 5); + tmp86__ |= (pSrc->shortGI160and80plus80MHz << 6); + tmp86__ |= (pSrc->txSTBC << 7); + tmp86__ |= (pSrc->rxSTBC << 8); + tmp86__ |= (pSrc->suBeamFormerCap << 11); + tmp86__ |= (pSrc->suBeamformeeCap << 12); + tmp86__ |= (pSrc->csnofBeamformerAntSup << 13); + tmp86__ |= (pSrc->numSoundingDim << 16); + tmp86__ |= (pSrc->muBeamformerCap << 19); + tmp86__ |= (pSrc->muBeamformeeCap << 20); + tmp86__ |= (pSrc->vhtTXOPPS << 21); + tmp86__ |= (pSrc->htcVHTCap << 22); + tmp86__ |= (pSrc->maxAMPDULenExp << 23); + tmp86__ |= (pSrc->vhtLinkAdaptCap << 26); + tmp86__ |= (pSrc->rxAntPattern << 28); + tmp86__ |= (pSrc->txAntPattern << 29); + tmp86__ |= (pSrc->reserved1 << 30); + frameshtonl(pCtx, pBuf, tmp86__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp85__ = 0U; - tmp85__ |= (pSrc->rxHighSupDataRate << 0); - tmp85__ |= (pSrc->reserved2 << 13); - frameshtons(pCtx, pBuf, tmp85__, 0); + tmp87__ = 0U; + tmp87__ |= (pSrc->rxHighSupDataRate << 0); + tmp87__ |= (pSrc->reserved2 << 13); + frameshtons(pCtx, pBuf, tmp87__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp86__ = 0U; - tmp86__ |= (pSrc->txSupDataRate << 0); - tmp86__ |= (pSrc->reserved3 << 13); - frameshtons(pCtx, pBuf, tmp86__, 0); + tmp88__ = 0U; + tmp88__ |= (pSrc->txSupDataRate << 0); + tmp88__ |= (pSrc->reserved3 << 13); + frameshtons(pCtx, pBuf, tmp88__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -15126,7 +15460,7 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp87__; + uint16_t tmp89__; nNeeded += 15; while (pSrc->present) { if (nNeeded > nBuf) @@ -15148,12 +15482,12 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp87__ = 0U; - tmp87__ |= (pSrc->aggregation << 0); - tmp87__ |= (pSrc->tsid << 1); - tmp87__ |= (pSrc->direction << 5); - tmp87__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp87__, 0); + tmp89__ = 0U; + tmp89__ |= (pSrc->aggregation << 0); + tmp89__ |= (pSrc->tsid << 1); + tmp89__ |= (pSrc->direction << 5); + tmp89__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp89__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -15387,9 +15721,9 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp88__; - uint8_t tmp89__; uint16_t tmp90__; + uint8_t tmp91__; + uint16_t tmp92__; nNeeded += 38; while (pSrc->present) { if (nNeeded > nBuf) @@ -15411,30 +15745,30 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp88__ = 0U; - tmp88__ |= (pSrc->traffic_type << 0); - tmp88__ |= (pSrc->tsid << 1); - tmp88__ |= (pSrc->direction << 5); - tmp88__ |= (pSrc->access_policy << 7); - tmp88__ |= (pSrc->aggregation << 9); - tmp88__ |= (pSrc->psb << 10); - tmp88__ |= (pSrc->user_priority << 11); - tmp88__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp88__, 0); + tmp90__ = 0U; + tmp90__ |= (pSrc->traffic_type << 0); + tmp90__ |= (pSrc->tsid << 1); + tmp90__ |= (pSrc->direction << 5); + tmp90__ |= (pSrc->access_policy << 7); + tmp90__ |= (pSrc->aggregation << 9); + tmp90__ |= (pSrc->psb << 10); + tmp90__ |= (pSrc->user_priority << 11); + tmp90__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp90__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp89__ = 0U; - tmp89__ |= (pSrc->tsinfo_rsvd << 0); - tmp89__ |= (pSrc->burst_size_defn << 7); - *pBuf = tmp89__; + tmp91__ = 0U; + tmp91__ |= (pSrc->tsinfo_rsvd << 0); + tmp91__ |= (pSrc->burst_size_defn << 7); + *pBuf = tmp91__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp90__ = 0U; - tmp90__ |= (pSrc->size << 0); - tmp90__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp90__, 0); + tmp92__ = 0U; + tmp92__ |= (pSrc->size << 0); + tmp92__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp92__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -15524,6 +15858,196 @@ uint32_t dot11f_pack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_wider_bw_chan_switch_ann. */ +uint32_t dot11f_pack_ie_azimuth_req(tpAniSirGlobal pCtx, + tDot11fIEazimuth_req *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 1; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 1; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->request; + *pnConsumed += 1; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_azimuth_req. */ + +uint32_t dot11f_pack_ie_max_age(tpAniSirGlobal pCtx, + tDot11fIEmax_age *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 2; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 4; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + frameshtons(pCtx, pBuf, pSrc->max_age, 0); + *pnConsumed += 2; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_max_age. */ + +uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, + tDot11fIEneighbor_rpt *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + uint8_t tmp93__; + uint8_t tmp94__; + uint32_t status = DOT11F_PARSE_SUCCESS; + status = dot11f_get_packed_ie_neighbor_rpt(pCtx, pSrc, &nNeeded); + if (!DOT11F_SUCCEEDED(status)) + return status; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 52; + ++pBuf; --nBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; --nBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); + *pnConsumed += 6; + pBuf += 6; + tmp93__ = 0U; + tmp93__ |= (pSrc->APReachability << 0); + tmp93__ |= (pSrc->Security << 2); + tmp93__ |= (pSrc->KeyScope << 3); + tmp93__ |= (pSrc->SpecMgmtCap << 4); + tmp93__ |= (pSrc->QosCap << 5); + tmp93__ |= (pSrc->apsd << 6); + tmp93__ |= (pSrc->rrm << 7); + *pBuf = tmp93__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp94__ = 0U; + tmp94__ |= (pSrc->DelayedBA << 0); + tmp94__ |= (pSrc->ImmBA << 1); + tmp94__ |= (pSrc->MobilityDomain << 2); + tmp94__ |= (pSrc->reserved << 3); + *pBuf = tmp94__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->reserved1, 0); + *pnConsumed += 2; + pBuf += 2; + *pBuf = pSrc->regulatoryClass; + *pnConsumed += 1; + pBuf += 1; + *pBuf = pSrc->channel; + *pnConsumed += 1; + pBuf += 1; + *pBuf = pSrc->PhyType; + *pnConsumed += 1; + pBuf += 1; + status = pack_core(pCtx, + (uint8_t *)pSrc, + pBuf, + nBuf, + pnConsumed, + FFS_neighbor_rpt, + IES_neighbor_rpt); + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return status; +} /* End dot11f_pack_ie_neighbor_rpt. */ + +uint32_t dot11f_pack_ie_req_mac_addr(tpAniSirGlobal pCtx, + tDot11fIEreq_mac_addr *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 6; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 2; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->addr, 6); + *pnConsumed += 6; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_req_mac_addr. */ + +uint32_t dot11f_pack_ie_tgt_mac_addr(tpAniSirGlobal pCtx, + tDot11fIEtgt_mac_addr *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 6; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 3; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->addr, 6); + *pnConsumed += 6; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_tgt_mac_addr. */ + uint32_t dot11f_pack_ie_aid(tpAniSirGlobal pCtx, tDot11fIEAID *pSrc, uint8_t *pBuf, @@ -15768,14 +16292,14 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp91__; - uint8_t tmp92__; - uint8_t tmp93__; - uint8_t tmp94__; uint8_t tmp95__; uint8_t tmp96__; uint8_t tmp97__; uint8_t tmp98__; + uint8_t tmp99__; + uint8_t tmp100__; + uint8_t tmp101__; + uint8_t tmp102__; nNeeded += 18; while (pSrc->present) { if (nNeeded > nBuf) @@ -15790,76 +16314,76 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; - tmp91__ = 0U; - tmp91__ |= (pSrc->acbe_aifsn << 0); - tmp91__ |= (pSrc->acbe_acm << 4); - tmp91__ |= (pSrc->acbe_aci << 5); - tmp91__ |= (pSrc->unused1 << 7); - *pBuf = tmp91__; + tmp95__ = 0U; + tmp95__ |= (pSrc->acbe_aifsn << 0); + tmp95__ |= (pSrc->acbe_acm << 4); + tmp95__ |= (pSrc->acbe_aci << 5); + tmp95__ |= (pSrc->unused1 << 7); + *pBuf = tmp95__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp92__ = 0U; - tmp92__ |= (pSrc->acbe_acwmin << 0); - tmp92__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp92__; + tmp96__ = 0U; + tmp96__ |= (pSrc->acbe_acwmin << 0); + tmp96__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp96__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp93__ = 0U; - tmp93__ |= (pSrc->acbk_aifsn << 0); - tmp93__ |= (pSrc->acbk_acm << 4); - tmp93__ |= (pSrc->acbk_aci << 5); - tmp93__ |= (pSrc->unused2 << 7); - *pBuf = tmp93__; + tmp97__ = 0U; + tmp97__ |= (pSrc->acbk_aifsn << 0); + tmp97__ |= (pSrc->acbk_acm << 4); + tmp97__ |= (pSrc->acbk_aci << 5); + tmp97__ |= (pSrc->unused2 << 7); + *pBuf = tmp97__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp94__ = 0U; - tmp94__ |= (pSrc->acbk_acwmin << 0); - tmp94__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp94__; + tmp98__ = 0U; + tmp98__ |= (pSrc->acbk_acwmin << 0); + tmp98__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp98__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp95__ = 0U; - tmp95__ |= (pSrc->acvi_aifsn << 0); - tmp95__ |= (pSrc->acvi_acm << 4); - tmp95__ |= (pSrc->acvi_aci << 5); - tmp95__ |= (pSrc->unused3 << 7); - *pBuf = tmp95__; + tmp99__ = 0U; + tmp99__ |= (pSrc->acvi_aifsn << 0); + tmp99__ |= (pSrc->acvi_acm << 4); + tmp99__ |= (pSrc->acvi_aci << 5); + tmp99__ |= (pSrc->unused3 << 7); + *pBuf = tmp99__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp96__ = 0U; - tmp96__ |= (pSrc->acvi_acwmin << 0); - tmp96__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp96__; + tmp100__ = 0U; + tmp100__ |= (pSrc->acvi_acwmin << 0); + tmp100__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp100__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp97__ = 0U; - tmp97__ |= (pSrc->acvo_aifsn << 0); - tmp97__ |= (pSrc->acvo_acm << 4); - tmp97__ |= (pSrc->acvo_aci << 5); - tmp97__ |= (pSrc->unused4 << 7); - *pBuf = tmp97__; + tmp101__ = 0U; + tmp101__ |= (pSrc->acvo_aifsn << 0); + tmp101__ |= (pSrc->acvo_acm << 4); + tmp101__ |= (pSrc->acvo_aci << 5); + tmp101__ |= (pSrc->unused4 << 7); + *pBuf = tmp101__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp98__ = 0U; - tmp98__ |= (pSrc->acvo_acwmin << 0); - tmp98__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp98__; + tmp102__ = 0U; + tmp102__ |= (pSrc->acvo_acwmin << 0); + tmp102__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp102__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -15884,7 +16408,7 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp99__; + uint8_t tmp103__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -15893,12 +16417,12 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp99__ = 0U; - tmp99__ |= (pSrc->non_erp_present << 0); - tmp99__ |= (pSrc->use_prot << 1); - tmp99__ |= (pSrc->barker_preamble << 2); - tmp99__ |= (pSrc->unused << 3); - *pBuf = tmp99__; + tmp103__ = 0U; + tmp103__ |= (pSrc->non_erp_present << 0); + tmp103__ |= (pSrc->use_prot << 1); + tmp103__ |= (pSrc->barker_preamble << 2); + tmp103__ |= (pSrc->unused << 3); + *pBuf = tmp103__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -15957,7 +16481,7 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp100__; + uint8_t tmp104__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -15977,10 +16501,10 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, *pBuf = pSrc->mgmt_state; *pnConsumed += 1; pBuf += 1; - tmp100__ = 0U; - tmp100__ |= (pSrc->mbssid_mask << 0); - tmp100__ |= (pSrc->reserved << 3); - *pBuf = tmp100__; + tmp104__ = 0U; + tmp104__ |= (pSrc->mbssid_mask << 0); + tmp104__ |= (pSrc->reserved << 3); + *pBuf = tmp104__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -16331,7 +16855,7 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp101__; + uint16_t tmp105__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ieft_info(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16343,10 +16867,10 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; --nBuf; ++(*pnConsumed); - tmp101__ = 0U; - tmp101__ |= (pSrc->reserved << 0); - tmp101__ |= (pSrc->IECount << 8); - frameshtons(pCtx, pBuf, tmp101__, 0); + tmp105__ = 0U; + tmp105__ |= (pSrc->reserved << 0); + tmp105__ |= (pSrc->IECount << 8); + frameshtons(pCtx, pBuf, tmp105__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -16384,11 +16908,11 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp102__; - uint8_t tmp103__; - uint16_t tmp104__; - uint32_t tmp105__; - uint8_t tmp106__; + uint16_t tmp106__; + uint8_t tmp107__; + uint16_t tmp108__; + uint32_t tmp109__; + uint8_t tmp110__; nNeeded += (pSrc->num_rsvd + 26); while (pSrc->present) { if (nNeeded > nBuf) @@ -16397,77 +16921,77 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp102__ = 0U; - tmp102__ |= (pSrc->advCodingCap << 0); - tmp102__ |= (pSrc->supportedChannelWidthSet << 1); - tmp102__ |= (pSrc->mimoPowerSave << 2); - tmp102__ |= (pSrc->greenField << 4); - tmp102__ |= (pSrc->shortGI20MHz << 5); - tmp102__ |= (pSrc->shortGI40MHz << 6); - tmp102__ |= (pSrc->txSTBC << 7); - tmp102__ |= (pSrc->rxSTBC << 8); - tmp102__ |= (pSrc->delayedBA << 10); - tmp102__ |= (pSrc->maximalAMSDUsize << 11); - tmp102__ |= (pSrc->dsssCckMode40MHz << 12); - tmp102__ |= (pSrc->psmp << 13); - tmp102__ |= (pSrc->stbcControlFrame << 14); - tmp102__ |= (pSrc->lsigTXOPProtection << 15); - frameshtons(pCtx, pBuf, tmp102__, 0); + tmp106__ = 0U; + tmp106__ |= (pSrc->advCodingCap << 0); + tmp106__ |= (pSrc->supportedChannelWidthSet << 1); + tmp106__ |= (pSrc->mimoPowerSave << 2); + tmp106__ |= (pSrc->greenField << 4); + tmp106__ |= (pSrc->shortGI20MHz << 5); + tmp106__ |= (pSrc->shortGI40MHz << 6); + tmp106__ |= (pSrc->txSTBC << 7); + tmp106__ |= (pSrc->rxSTBC << 8); + tmp106__ |= (pSrc->delayedBA << 10); + tmp106__ |= (pSrc->maximalAMSDUsize << 11); + tmp106__ |= (pSrc->dsssCckMode40MHz << 12); + tmp106__ |= (pSrc->psmp << 13); + tmp106__ |= (pSrc->stbcControlFrame << 14); + tmp106__ |= (pSrc->lsigTXOPProtection << 15); + frameshtons(pCtx, pBuf, tmp106__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp103__ = 0U; - tmp103__ |= (pSrc->maxRxAMPDUFactor << 0); - tmp103__ |= (pSrc->mpduDensity << 2); - tmp103__ |= (pSrc->reserved1 << 5); - *pBuf = tmp103__; + tmp107__ = 0U; + tmp107__ |= (pSrc->maxRxAMPDUFactor << 0); + tmp107__ |= (pSrc->mpduDensity << 2); + tmp107__ |= (pSrc->reserved1 << 5); + *pBuf = tmp107__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16); *pnConsumed += 16; pBuf += 16; - tmp104__ = 0U; - tmp104__ |= (pSrc->pco << 0); - tmp104__ |= (pSrc->transitionTime << 1); - tmp104__ |= (pSrc->reserved2 << 3); - tmp104__ |= (pSrc->mcsFeedback << 8); - tmp104__ |= (pSrc->reserved3 << 10); - frameshtons(pCtx, pBuf, tmp104__, 0); + tmp108__ = 0U; + tmp108__ |= (pSrc->pco << 0); + tmp108__ |= (pSrc->transitionTime << 1); + tmp108__ |= (pSrc->reserved2 << 3); + tmp108__ |= (pSrc->mcsFeedback << 8); + tmp108__ |= (pSrc->reserved3 << 10); + frameshtons(pCtx, pBuf, tmp108__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp105__ = 0U; - tmp105__ |= (pSrc->txBF << 0); - tmp105__ |= (pSrc->rxStaggeredSounding << 1); - tmp105__ |= (pSrc->txStaggeredSounding << 2); - tmp105__ |= (pSrc->rxZLF << 3); - tmp105__ |= (pSrc->txZLF << 4); - tmp105__ |= (pSrc->implicitTxBF << 5); - tmp105__ |= (pSrc->calibration << 6); - tmp105__ |= (pSrc->explicitCSITxBF << 8); - tmp105__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); - tmp105__ |= (pSrc->explicitBFCSIFeedback << 10); - tmp105__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); - tmp105__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); - tmp105__ |= (pSrc->csiNumBFAntennae << 19); - tmp105__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); - tmp105__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); - tmp105__ |= (pSrc->reserved4 << 25); - frameshtonl(pCtx, pBuf, tmp105__, 0); + tmp109__ = 0U; + tmp109__ |= (pSrc->txBF << 0); + tmp109__ |= (pSrc->rxStaggeredSounding << 1); + tmp109__ |= (pSrc->txStaggeredSounding << 2); + tmp109__ |= (pSrc->rxZLF << 3); + tmp109__ |= (pSrc->txZLF << 4); + tmp109__ |= (pSrc->implicitTxBF << 5); + tmp109__ |= (pSrc->calibration << 6); + tmp109__ |= (pSrc->explicitCSITxBF << 8); + tmp109__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); + tmp109__ |= (pSrc->explicitBFCSIFeedback << 10); + tmp109__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); + tmp109__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); + tmp109__ |= (pSrc->csiNumBFAntennae << 19); + tmp109__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); + tmp109__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); + tmp109__ |= (pSrc->reserved4 << 25); + frameshtonl(pCtx, pBuf, tmp109__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp106__ = 0U; - tmp106__ |= (pSrc->antennaSelection << 0); - tmp106__ |= (pSrc->explicitCSIFeedbackTx << 1); - tmp106__ |= (pSrc->antennaIndicesFeedbackTx << 2); - tmp106__ |= (pSrc->explicitCSIFeedback << 3); - tmp106__ |= (pSrc->antennaIndicesFeedback << 4); - tmp106__ |= (pSrc->rxAS << 5); - tmp106__ |= (pSrc->txSoundingPPDUs << 6); - tmp106__ |= (pSrc->reserved5 << 7); - *pBuf = tmp106__; + tmp110__ = 0U; + tmp110__ |= (pSrc->antennaSelection << 0); + tmp110__ |= (pSrc->explicitCSIFeedbackTx << 1); + tmp110__ |= (pSrc->antennaIndicesFeedbackTx << 2); + tmp110__ |= (pSrc->explicitCSIFeedback << 3); + tmp110__ |= (pSrc->antennaIndicesFeedback << 4); + tmp110__ |= (pSrc->rxAS << 5); + tmp110__ |= (pSrc->txSoundingPPDUs << 6); + tmp110__ |= (pSrc->reserved5 << 7); + *pBuf = tmp110__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16492,9 +17016,9 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp107__; - uint16_t tmp108__; - uint16_t tmp109__; + uint8_t tmp111__; + uint16_t tmp112__; + uint16_t tmp113__; nNeeded += (pSrc->num_rsvd + 22); while (pSrc->present) { if (nNeeded > nBuf) @@ -16506,35 +17030,35 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, *pBuf = pSrc->primaryChannel; *pnConsumed += 1; pBuf += 1; - tmp107__ = 0U; - tmp107__ |= (pSrc->secondaryChannelOffset << 0); - tmp107__ |= (pSrc->recommendedTxWidthSet << 2); - tmp107__ |= (pSrc->rifsMode << 3); - tmp107__ |= (pSrc->controlledAccessOnly << 4); - tmp107__ |= (pSrc->serviceIntervalGranularity << 5); - *pBuf = tmp107__; + tmp111__ = 0U; + tmp111__ |= (pSrc->secondaryChannelOffset << 0); + tmp111__ |= (pSrc->recommendedTxWidthSet << 2); + tmp111__ |= (pSrc->rifsMode << 3); + tmp111__ |= (pSrc->controlledAccessOnly << 4); + tmp111__ |= (pSrc->serviceIntervalGranularity << 5); + *pBuf = tmp111__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp108__ = 0U; - tmp108__ |= (pSrc->opMode << 0); - tmp108__ |= (pSrc->nonGFDevicesPresent << 2); - tmp108__ |= (pSrc->transmitBurstLimit << 3); - tmp108__ |= (pSrc->obssNonHTStaPresent << 4); - tmp108__ |= (pSrc->reserved << 5); - frameshtons(pCtx, pBuf, tmp108__, 0); + tmp112__ = 0U; + tmp112__ |= (pSrc->opMode << 0); + tmp112__ |= (pSrc->nonGFDevicesPresent << 2); + tmp112__ |= (pSrc->transmitBurstLimit << 3); + tmp112__ |= (pSrc->obssNonHTStaPresent << 4); + tmp112__ |= (pSrc->reserved << 5); + frameshtons(pCtx, pBuf, tmp112__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp109__ = 0U; - tmp109__ |= (pSrc->basicSTBCMCS << 0); - tmp109__ |= (pSrc->dualCTSProtection << 7); - tmp109__ |= (pSrc->secondaryBeacon << 8); - tmp109__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); - tmp109__ |= (pSrc->pcoActive << 10); - tmp109__ |= (pSrc->pcoPhase << 11); - tmp109__ |= (pSrc->reserved2 << 12); - frameshtons(pCtx, pBuf, tmp109__, 0); + tmp113__ = 0U; + tmp113__ |= (pSrc->basicSTBCMCS << 0); + tmp113__ |= (pSrc->dualCTSProtection << 7); + tmp113__ |= (pSrc->secondaryBeacon << 8); + tmp113__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); + tmp113__ |= (pSrc->pcoActive << 10); + tmp113__ |= (pSrc->pcoPhase << 11); + tmp113__ |= (pSrc->reserved2 << 12); + frameshtons(pCtx, pBuf, tmp113__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -16626,9 +17150,9 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp110__; - uint8_t tmp111__; - uint8_t tmp112__; + uint8_t tmp114__; + uint8_t tmp115__; + uint8_t tmp116__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16643,12 +17167,12 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, *pBuf = pSrc->token; *pnConsumed += 1; pBuf += 1; - tmp110__ = 0U; - tmp110__ |= (pSrc->late << 0); - tmp110__ |= (pSrc->incapable << 1); - tmp110__ |= (pSrc->refused << 2); - tmp110__ |= (pSrc->unused << 3); - *pBuf = tmp110__; + tmp114__ = 0U; + tmp114__ |= (pSrc->late << 0); + tmp114__ |= (pSrc->incapable << 1); + tmp114__ |= (pSrc->refused << 2); + tmp114__ |= (pSrc->unused << 3); + *pBuf = tmp114__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16667,14 +17191,14 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp111__ = 0U; - tmp111__ |= (pSrc->report.Basic.bss << 0); - tmp111__ |= (pSrc->report.Basic.ofdm_preamble << 1); - tmp111__ |= (pSrc->report.Basic.unid_signal << 2); - tmp111__ |= (pSrc->report.Basic.rader << 3); - tmp111__ |= (pSrc->report.Basic.unmeasured << 4); - tmp111__ |= (pSrc->report.Basic.unused << 5); - *pBuf = tmp111__; + tmp115__ = 0U; + tmp115__ |= (pSrc->report.Basic.bss << 0); + tmp115__ |= (pSrc->report.Basic.ofdm_preamble << 1); + tmp115__ |= (pSrc->report.Basic.unid_signal << 2); + tmp115__ |= (pSrc->report.Basic.rader << 3); + tmp115__ |= (pSrc->report.Basic.unmeasured << 4); + tmp115__ |= (pSrc->report.Basic.unused << 5); + *pBuf = tmp115__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -16741,10 +17265,10 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp112__ = 0U; - tmp112__ |= (pSrc->report.Beacon.condensed_PHY << 0); - tmp112__ |= (pSrc->report.Beacon.reported_frame_type << 7); - *pBuf = tmp112__; + tmp116__ = 0U; + tmp116__ |= (pSrc->report.Beacon.condensed_PHY << 0); + tmp116__ |= (pSrc->report.Beacon.reported_frame_type << 7); + *pBuf = tmp116__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16793,7 +17317,7 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp113__; + uint8_t tmp117__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_request(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16808,14 +17332,14 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, *pBuf = pSrc->measurement_token; *pnConsumed += 1; pBuf += 1; - tmp113__ = 0U; - tmp113__ |= (pSrc->parallel << 0); - tmp113__ |= (pSrc->enable << 1); - tmp113__ |= (pSrc->request << 2); - tmp113__ |= (pSrc->report << 3); - tmp113__ |= (pSrc->durationMandatory << 4); - tmp113__ |= (pSrc->unused << 5); - *pBuf = tmp113__; + tmp117__ = 0U; + tmp117__ |= (pSrc->parallel << 0); + tmp117__ |= (pSrc->enable << 1); + tmp117__ |= (pSrc->request << 2); + tmp117__ |= (pSrc->report << 3); + tmp117__ |= (pSrc->durationMandatory << 4); + tmp117__ |= (pSrc->unused << 5); + *pBuf = tmp117__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16883,6 +17407,33 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, FFS_measurement_requestBeacon, IES_measurement_requestBeacon); break; + case 8: + *pBuf = pSrc->measurement_request.lci.loc_subject; + *pnConsumed += 1; + pBuf += 1; + status = pack_core(pCtx, + (uint8_t *)pSrc, + pBuf, + nBuf, + pnConsumed, + FFS_measurement_requestlci, + IES_measurement_requestlci); + break; + case 16: + frameshtons(pCtx, pBuf, pSrc->measurement_request.ftmrr.random_interval, 0); + *pnConsumed += 2; + pBuf += 2; + *pBuf = pSrc->measurement_request.ftmrr.min_ap_count; + *pnConsumed += 1; + pBuf += 1; + status = pack_core(pCtx, + (uint8_t *)pSrc, + pBuf, + nBuf, + pnConsumed, + FFS_measurement_requestftmrr, + IES_measurement_requestftmrr); + break; } break; } @@ -16902,7 +17453,7 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp114__; + uint8_t tmp118__; nNeeded += 3; while (pSrc->present) { if (nNeeded > nBuf) @@ -16914,11 +17465,11 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->MDID, 0); *pnConsumed += 2; pBuf += 2; - tmp114__ = 0U; - tmp114__ |= (pSrc->overDSCap << 0); - tmp114__ |= (pSrc->resourceReqCap << 1); - tmp114__ |= (pSrc->reserved << 2); - *pBuf = tmp114__; + tmp118__ = 0U; + tmp118__ |= (pSrc->overDSCap << 0); + tmp118__ |= (pSrc->resourceReqCap << 1); + tmp118__ |= (pSrc->reserved << 2); + *pBuf = tmp118__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -16940,8 +17491,8 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp115__; - uint8_t tmp116__; + uint8_t tmp119__; + uint8_t tmp120__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16956,24 +17507,24 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp115__ = 0U; - tmp115__ |= (pSrc->APReachability << 0); - tmp115__ |= (pSrc->Security << 2); - tmp115__ |= (pSrc->KeyScope << 3); - tmp115__ |= (pSrc->SpecMgmtCap << 4); - tmp115__ |= (pSrc->QosCap << 5); - tmp115__ |= (pSrc->apsd << 6); - tmp115__ |= (pSrc->rrm << 7); - *pBuf = tmp115__; + tmp119__ = 0U; + tmp119__ |= (pSrc->APReachability << 0); + tmp119__ |= (pSrc->Security << 2); + tmp119__ |= (pSrc->KeyScope << 3); + tmp119__ |= (pSrc->SpecMgmtCap << 4); + tmp119__ |= (pSrc->QosCap << 5); + tmp119__ |= (pSrc->apsd << 6); + tmp119__ |= (pSrc->rrm << 7); + *pBuf = tmp119__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp116__ = 0U; - tmp116__ |= (pSrc->DelayedBA << 0); - tmp116__ |= (pSrc->ImmBA << 1); - tmp116__ |= (pSrc->MobilityDomain << 2); - tmp116__ |= (pSrc->reserved << 3); - *pBuf = tmp116__; + tmp120__ = 0U; + tmp120__ |= (pSrc->DelayedBA << 0); + tmp120__ |= (pSrc->ImmBA << 1); + tmp120__ |= (pSrc->MobilityDomain << 2); + tmp120__ |= (pSrc->reserved << 3); + *pBuf = tmp120__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17061,7 +17612,7 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp117__; + uint8_t tmp121__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17070,12 +17621,12 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp117__ = 0U; - tmp117__ |= (pSrc->chanWidth << 0); - tmp117__ |= (pSrc->reserved << 2); - tmp117__ |= (pSrc->rxNSS << 4); - tmp117__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp117__; + tmp121__ = 0U; + tmp121__ |= (pSrc->chanWidth << 0); + tmp121__ |= (pSrc->reserved << 2); + tmp121__ |= (pSrc->rxNSS << 4); + tmp121__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp121__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -17550,7 +18101,7 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp118__; + uint8_t tmp122__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17559,13 +18110,13 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp118__ = 0U; - tmp118__ |= (pSrc->ac_bk_traffic_aval << 0); - tmp118__ |= (pSrc->ac_be_traffic_aval << 1); - tmp118__ |= (pSrc->ac_vi_traffic_aval << 2); - tmp118__ |= (pSrc->ac_vo_traffic_aval << 3); - tmp118__ |= (pSrc->reserved << 4); - *pBuf = tmp118__; + tmp122__ = 0U; + tmp122__ |= (pSrc->ac_bk_traffic_aval << 0); + tmp122__ |= (pSrc->ac_be_traffic_aval << 1); + tmp122__ |= (pSrc->ac_vi_traffic_aval << 2); + tmp122__ |= (pSrc->ac_vo_traffic_aval << 3); + tmp122__ |= (pSrc->reserved << 4); + *pBuf = tmp122__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -17721,7 +18272,7 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp119__; + uint8_t tmp123__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17730,13 +18281,13 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp119__ = 0U; - tmp119__ |= (pSrc->count << 0); - tmp119__ |= (pSrc->qack << 4); - tmp119__ |= (pSrc->qreq << 5); - tmp119__ |= (pSrc->txopreq << 6); - tmp119__ |= (pSrc->reserved << 7); - *pBuf = tmp119__; + tmp123__ = 0U; + tmp123__ |= (pSrc->count << 0); + tmp123__ |= (pSrc->qack << 4); + tmp123__ |= (pSrc->qreq << 5); + tmp123__ |= (pSrc->txopreq << 6); + tmp123__ |= (pSrc->reserved << 7); + *pBuf = tmp123__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -17758,7 +18309,7 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp120__; + uint8_t tmp124__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17767,15 +18318,15 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp120__ = 0U; - tmp120__ |= (pSrc->acvo_uapsd << 0); - tmp120__ |= (pSrc->acvi_uapsd << 1); - tmp120__ |= (pSrc->acbk_uapsd << 2); - tmp120__ |= (pSrc->acbe_uapsd << 3); - tmp120__ |= (pSrc->qack << 4); - tmp120__ |= (pSrc->max_sp_length << 5); - tmp120__ |= (pSrc->more_data_ack << 7); - *pBuf = tmp120__; + tmp124__ = 0U; + tmp124__ |= (pSrc->acvo_uapsd << 0); + tmp124__ |= (pSrc->acvi_uapsd << 1); + tmp124__ |= (pSrc->acbk_uapsd << 2); + tmp124__ |= (pSrc->acbe_uapsd << 3); + tmp124__ |= (pSrc->qack << 4); + tmp124__ |= (pSrc->max_sp_length << 5); + tmp124__ |= (pSrc->more_data_ack << 7); + *pBuf = tmp124__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18412,7 +18963,7 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp121__; + uint16_t tmp125__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_iewapi(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -18442,10 +18993,10 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4); *pnConsumed += 4; pBuf += 4; - tmp121__ = 0U; - tmp121__ |= (pSrc->preauth << 0); - tmp121__ |= (pSrc->reserved << 1); - frameshtons(pCtx, pBuf, tmp121__, 0); + tmp125__ = 0U; + tmp125__ |= (pSrc->preauth << 0); + tmp125__ |= (pSrc->reserved << 1); + frameshtons(pCtx, pBuf, tmp125__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18585,7 +19136,7 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp122__; + uint8_t tmp126__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -18607,13 +19158,13 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp122__ = 0U; - tmp122__ |= (pSrc->reserved << 0); - tmp122__ |= (pSrc->qack << 4); - tmp122__ |= (pSrc->queue_request << 5); - tmp122__ |= (pSrc->txop_request << 6); - tmp122__ |= (pSrc->more_ack << 7); - *pBuf = tmp122__; + tmp126__ = 0U; + tmp126__ |= (pSrc->reserved << 0); + tmp126__ |= (pSrc->qack << 4); + tmp126__ |= (pSrc->queue_request << 5); + tmp126__ |= (pSrc->txop_request << 6); + tmp126__ |= (pSrc->more_ack << 7); + *pBuf = tmp126__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18635,7 +19186,7 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp123__; + uint8_t tmp127__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -18657,11 +19208,11 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp123__ = 0U; - tmp123__ |= (pSrc->param_set_count << 0); - tmp123__ |= (pSrc->reserved << 4); - tmp123__ |= (pSrc->uapsd << 7); - *pBuf = tmp123__; + tmp127__ = 0U; + tmp127__ |= (pSrc->param_set_count << 0); + tmp127__ |= (pSrc->reserved << 4); + tmp127__ |= (pSrc->uapsd << 7); + *pBuf = tmp127__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18683,7 +19234,7 @@ uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp124__; + uint8_t tmp128__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -18705,15 +19256,15 @@ uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp124__ = 0U; - tmp124__ |= (pSrc->acvo_uapsd << 0); - tmp124__ |= (pSrc->acvi_uapsd << 1); - tmp124__ |= (pSrc->acbk_uapsd << 2); - tmp124__ |= (pSrc->acbe_uapsd << 3); - tmp124__ |= (pSrc->reserved1 << 4); - tmp124__ |= (pSrc->max_sp_length << 5); - tmp124__ |= (pSrc->reserved2 << 7); - *pBuf = tmp124__; + tmp128__ = 0U; + tmp128__ |= (pSrc->acvo_uapsd << 0); + tmp128__ |= (pSrc->acvi_uapsd << 1); + tmp128__ |= (pSrc->acbk_uapsd << 2); + tmp128__ |= (pSrc->acbe_uapsd << 3); + tmp128__ |= (pSrc->reserved1 << 4); + tmp128__ |= (pSrc->max_sp_length << 5); + tmp128__ |= (pSrc->reserved2 << 7); + *pBuf = tmp128__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18735,14 +19286,14 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp125__; - uint8_t tmp126__; - uint8_t tmp127__; - uint8_t tmp128__; uint8_t tmp129__; uint8_t tmp130__; uint8_t tmp131__; uint8_t tmp132__; + uint8_t tmp133__; + uint8_t tmp134__; + uint8_t tmp135__; + uint8_t tmp136__; nNeeded += 19; while (pSrc->present) { if (nNeeded > nBuf) @@ -18770,76 +19321,76 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved2; *pnConsumed += 1; pBuf += 1; - tmp125__ = 0U; - tmp125__ |= (pSrc->acbe_aifsn << 0); - tmp125__ |= (pSrc->acbe_acm << 4); - tmp125__ |= (pSrc->acbe_aci << 5); - tmp125__ |= (pSrc->unused1 << 7); - *pBuf = tmp125__; + tmp129__ = 0U; + tmp129__ |= (pSrc->acbe_aifsn << 0); + tmp129__ |= (pSrc->acbe_acm << 4); + tmp129__ |= (pSrc->acbe_aci << 5); + tmp129__ |= (pSrc->unused1 << 7); + *pBuf = tmp129__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp126__ = 0U; - tmp126__ |= (pSrc->acbe_acwmin << 0); - tmp126__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp126__; + tmp130__ = 0U; + tmp130__ |= (pSrc->acbe_acwmin << 0); + tmp130__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp130__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp127__ = 0U; - tmp127__ |= (pSrc->acbk_aifsn << 0); - tmp127__ |= (pSrc->acbk_acm << 4); - tmp127__ |= (pSrc->acbk_aci << 5); - tmp127__ |= (pSrc->unused2 << 7); - *pBuf = tmp127__; + tmp131__ = 0U; + tmp131__ |= (pSrc->acbk_aifsn << 0); + tmp131__ |= (pSrc->acbk_acm << 4); + tmp131__ |= (pSrc->acbk_aci << 5); + tmp131__ |= (pSrc->unused2 << 7); + *pBuf = tmp131__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp128__ = 0U; - tmp128__ |= (pSrc->acbk_acwmin << 0); - tmp128__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp128__; + tmp132__ = 0U; + tmp132__ |= (pSrc->acbk_acwmin << 0); + tmp132__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp132__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp129__ = 0U; - tmp129__ |= (pSrc->acvi_aifsn << 0); - tmp129__ |= (pSrc->acvi_acm << 4); - tmp129__ |= (pSrc->acvi_aci << 5); - tmp129__ |= (pSrc->unused3 << 7); - *pBuf = tmp129__; + tmp133__ = 0U; + tmp133__ |= (pSrc->acvi_aifsn << 0); + tmp133__ |= (pSrc->acvi_acm << 4); + tmp133__ |= (pSrc->acvi_aci << 5); + tmp133__ |= (pSrc->unused3 << 7); + *pBuf = tmp133__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp130__ = 0U; - tmp130__ |= (pSrc->acvi_acwmin << 0); - tmp130__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp130__; + tmp134__ = 0U; + tmp134__ |= (pSrc->acvi_acwmin << 0); + tmp134__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp134__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp131__ = 0U; - tmp131__ |= (pSrc->acvo_aifsn << 0); - tmp131__ |= (pSrc->acvo_acm << 4); - tmp131__ |= (pSrc->acvo_aci << 5); - tmp131__ |= (pSrc->unused4 << 7); - *pBuf = tmp131__; + tmp135__ = 0U; + tmp135__ |= (pSrc->acvo_aifsn << 0); + tmp135__ |= (pSrc->acvo_acm << 4); + tmp135__ |= (pSrc->acvo_aci << 5); + tmp135__ |= (pSrc->unused4 << 7); + *pBuf = tmp135__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp132__ = 0U; - tmp132__ |= (pSrc->acvo_acwmin << 0); - tmp132__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp132__; + tmp136__ = 0U; + tmp136__ |= (pSrc->acvo_acwmin << 0); + tmp136__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp136__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19434,7 +19985,7 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp133__; + uint8_t tmp137__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -19443,14 +19994,14 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp133__ = 0U; - tmp133__ |= (pSrc->info_request << 0); - tmp133__ |= (pSrc->forty_mhz_intolerant << 1); - tmp133__ |= (pSrc->twenty_mhz_bsswidth_req << 2); - tmp133__ |= (pSrc->obss_scan_exemption_req << 3); - tmp133__ |= (pSrc->obss_scan_exemption_grant << 4); - tmp133__ |= (pSrc->unused << 5); - *pBuf = tmp133__; + tmp137__ = 0U; + tmp137__ |= (pSrc->info_request << 0); + tmp137__ |= (pSrc->forty_mhz_intolerant << 1); + tmp137__ |= (pSrc->twenty_mhz_bsswidth_req << 2); + tmp137__ |= (pSrc->obss_scan_exemption_req << 3); + tmp137__ |= (pSrc->obss_scan_exemption_grant << 4); + tmp137__ |= (pSrc->unused << 5); + *pBuf = tmp137__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20497,14 +21048,6 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, for (i = 0; i < countOffset; ++i) { len = 0U; switch (pIe->sig) { - case SigIeCondensedCountryStr: - status |= - dot11f_pack_ie_condensed_country_str( - pCtx, (tDot11fIECondensedCountryStr *) - (pSrc + pIe->offset + - sizeof(tDot11fIECondensedCountryStr) * i), - pBufRemaining, nBufRemaining, &len); - break; case SigIeGTK: status |= dot11f_pack_ie_gtk( @@ -20537,14 +21080,6 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIER1KH_ID) * i), pBufRemaining, nBufRemaining, &len); break; - case SigIeTSFInfo: - status |= - dot11f_pack_ie_tsf_info( - pCtx, (tDot11fIETSFInfo *) - (pSrc + pIe->offset + - sizeof(tDot11fIETSFInfo) * i), - pBufRemaining, nBufRemaining, &len); - break; case SigIeAPChannelReport: status |= dot11f_pack_ie_ap_channel_report( @@ -20577,6 +21112,14 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEBeaconReporting) * i), pBufRemaining, nBufRemaining, &len); break; + case SigIeCondensedCountryStr: + status |= + dot11f_pack_ie_condensed_country_str( + pCtx, (tDot11fIECondensedCountryStr *) + (pSrc + pIe->offset + + sizeof(tDot11fIECondensedCountryStr) * i), + pBufRemaining, nBufRemaining, &len); + break; case SigIeMeasurementPilot: status |= dot11f_pack_ie_measurement_pilot( @@ -20665,6 +21208,14 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIETSDelay) * i), pBufRemaining, nBufRemaining, &len); break; + case SigIeTSFInfo: + status |= + dot11f_pack_ie_tsf_info( + pCtx, (tDot11fIETSFInfo *) + (pSrc + pIe->offset + + sizeof(tDot11fIETSFInfo) * i), + pBufRemaining, nBufRemaining, &len); + break; case SigIeTSPEC: status |= dot11f_pack_ie_tspec( @@ -20737,6 +21288,46 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEWiderBWChanSwitchAnn) * i), pBufRemaining, nBufRemaining, &len); break; + case SigIeazimuth_req: + status |= + dot11f_pack_ie_azimuth_req( + pCtx, (tDot11fIEazimuth_req *) + (pSrc + pIe->offset + + sizeof(tDot11fIEazimuth_req) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIemax_age: + status |= + dot11f_pack_ie_max_age( + pCtx, (tDot11fIEmax_age *) + (pSrc + pIe->offset + + sizeof(tDot11fIEmax_age) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIeneighbor_rpt: + status |= + dot11f_pack_ie_neighbor_rpt( + pCtx, (tDot11fIEneighbor_rpt *) + (pSrc + pIe->offset + + sizeof(tDot11fIEneighbor_rpt) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIereq_mac_addr: + status |= + dot11f_pack_ie_req_mac_addr( + pCtx, (tDot11fIEreq_mac_addr *) + (pSrc + pIe->offset + + sizeof(tDot11fIEreq_mac_addr) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIetgt_mac_addr: + status |= + dot11f_pack_ie_tgt_mac_addr( + pCtx, (tDot11fIEtgt_mac_addr *) + (pSrc + pIe->offset + + sizeof(tDot11fIEtgt_mac_addr) * i), + pBufRemaining, nBufRemaining, &len); + break; case SigIeAID: status |= dot11f_pack_ie_aid(