From d3420e7eac52ea29efd33d531fa61478b797f6e8 Mon Sep 17 00:00:00 2001 From: gaurank kathpalia Date: Sat, 16 May 2020 10:08:25 +0530 Subject: [PATCH] qcacld-3.0: Remove IBSS related code from frame handling Remove IBSS related code from frame handling. Change-Id: I1efc71392112a53247c5b88e5c2d09e4dee0b802 CRs-Fixed: 2687979 --- core/mac/src/cfg/cfgUtil/dot11f.frms | 11 +- core/mac/src/include/dot11f.h | 165 ++++------- core/mac/src/include/parser_api.h | 3 - .../mac/src/sys/legacy/src/utils/src/dot11f.c | 271 ++++++------------ .../src/sys/legacy/src/utils/src/parser_api.c | 31 -- 5 files changed, 152 insertions(+), 329 deletions(-) diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms index b19b54951930..bb1b1894c602 100644 --- a/core/mac/src/cfg/cfgUtil/dot11f.frms +++ b/core/mac/src/cfg/cfgUtil/dot11f.frms @@ -1316,11 +1316,6 @@ IE TIM (EID_TIM) // 7.3.2.6 vbmp[1..251]; } -IE IBSSParams (EID_IBSS_PARAM_SET) // 7.3.2.7 -{ - atim, 2; -} - IE ChallengeText (EID_CHALLENGE_TEXT) // 7.3.2.8 { text[1..253]; @@ -3467,7 +3462,6 @@ FRAME Beacon // C.f. Sec. 7.2.3.1 OPTIE FHParamSet; OPTIE DSParams; OPTIE CFParams; - OPTIE IBSSParams; OPTIE TIM; OPTIE Country; OPTIE FHParams; @@ -3538,7 +3532,7 @@ FRAME Beacon // C.f. Sec. 7.2.3.1 // this: whenever our config changes, call schSetFixedBeaconFields. There, // we serialize the following Beacon fields into gSchBeaconFrameBegin (after // the power template & MAC header): TimeStamp, BeaconInterval, Capabilities, -// SSID, SuppRates, DSParams, & IBSSParams. It sets gSchBeaconOffsetBegin to +// SSID, SuppRates, DSParams. It sets gSchBeaconOffsetBegin to // the length of this buffer (incl. power template & MAC header). // Next, it serializes the following fields into gSchBeaconFrameEnd: Country, @@ -3566,7 +3560,6 @@ FRAME Beacon1 MANDIE SSID; MANDIE SuppRates; OPTIE DSParams; - OPTIE IBSSParams; } FRAME Beacon2 @@ -3637,7 +3630,6 @@ FRAME BeaconIEs OPTIE FHParamSet; OPTIE DSParams; OPTIE CFParams; - OPTIE IBSSParams; OPTIE TIM; OPTIE Country; OPTIE FHParams; @@ -3904,7 +3896,6 @@ FRAME ProbeResponse // 7.2.3.9 OPTIE FHParamSet; OPTIE DSParams; OPTIE CFParams; - OPTIE IBSSParams; OPTIE Country; OPTIE FHParams; OPTIE FHPattTable; diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index 4169fd9073e1..9ff6eb909bce 100644 --- a/core/mac/src/include/dot11f.h +++ b/core/mac/src/include/dot11f.h @@ -26,7 +26,7 @@ * * * This file was automatically generated by 'framesc' - * Wed Apr 15 11:04:38 2020 from the following file(s): + * Sat May 16 11:34:16 2020 from the following file(s): * * dot11f.frms * @@ -5442,45 +5442,6 @@ uint32_t dot11f_get_packed_ie_HTInfo( }; /* End extern "C". */ #endif /* C++ */ -/* EID 6 (0x06) */ -typedef struct sDot11fIEIBSSParams { - uint8_t present; - uint16_t atim; -} tDot11fIEIBSSParams; - -#define DOT11F_EID_IBSSPARAMS (6) - -/* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_IBSSPARAMS_MIN_LEN (2) - -#define DOT11F_IE_IBSSPARAMS_MAX_LEN (2) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -__must_check uint32_t dot11f_unpack_ie_ibss_params( - tpAniSirGlobal, - uint8_t *, - uint8_t, - tDot11fIEIBSSParams*, - bool); - -uint32_t dot11f_pack_ie_ibss_params( - tpAniSirGlobal, - tDot11fIEIBSSParams *, - uint8_t *, - uint32_t, - uint32_t*); - -uint32_t dot11f_get_packed_ie_IBSSParams( - tpAniSirGlobal, - tDot11fIEIBSSParams *, - uint32_t*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ - /* EID 101 (0x65) */ typedef struct sDot11fIELinkIdentifier { uint8_t present; @@ -9827,7 +9788,6 @@ typedef struct sDot11fBeacon{ tDot11fIEFHParamSet FHParamSet; tDot11fIEDSParams DSParams; tDot11fIECFParams CFParams; - tDot11fIEIBSSParams IBSSParams; tDot11fIETIM TIM; tDot11fIECountry Country; tDot11fIEFHParams FHParams; @@ -9912,7 +9872,6 @@ typedef struct sDot11fBeacon1{ tDot11fIESSID SSID; tDot11fIESuppRates SuppRates; tDot11fIEDSParams DSParams; - tDot11fIEIBSSParams IBSSParams; } tDot11fBeacon1; #define DOT11F_BEACON1 (7) @@ -10014,7 +9973,6 @@ typedef struct sDot11fBeaconIEs{ tDot11fIEFHParamSet FHParamSet; tDot11fIEDSParams DSParams; tDot11fIECFParams CFParams; - tDot11fIEIBSSParams IBSSParams; tDot11fIETIM TIM; tDot11fIECountry Country; tDot11fIEFHParams FHParams; @@ -10433,67 +10391,66 @@ uint32_t dot11f_get_packed_probe_request_size(tpAniSirGlobal pCtx, #endif /* C++ */ typedef struct sDot11fProbeResponse{ - tDot11fFfTimeStamp TimeStamp; - tDot11fFfBeaconInterval BeaconInterval; - tDot11fFfCapabilities Capabilities; - tDot11fIESSID SSID; - tDot11fIESuppRates SuppRates; - tDot11fIEFHParamSet FHParamSet; - tDot11fIEDSParams DSParams; - tDot11fIECFParams CFParams; - tDot11fIEIBSSParams IBSSParams; - tDot11fIECountry Country; - tDot11fIEFHParams FHParams; - tDot11fIEFHPattTable FHPattTable; - tDot11fIEPowerConstraints PowerConstraints; - tDot11fIEChanSwitchAnn ChanSwitchAnn; - tDot11fIEext_chan_switch_ann ext_chan_switch_ann; - tDot11fIESuppOperatingClasses SuppOperatingClasses; - tDot11fIEQuiet Quiet; - tDot11fIETPCReport TPCReport; - tDot11fIEERPInfo ERPInfo; - tDot11fIEExtSuppRates ExtSuppRates; - tDot11fIERSNOpaque RSNOpaque; - tDot11fIEQBSSLoad QBSSLoad; - tDot11fIEEDCAParamSet EDCAParamSet; - tDot11fIERRMEnabledCap RRMEnabledCap; - tDot11fIEAPChannelReport APChannelReport; - tDot11fIEMobilityDomain MobilityDomain; - tDot11fIEWPA WPA; - tDot11fIEHTCaps HTCaps; - tDot11fIEHTInfo HTInfo; - tDot11fIEsec_chan_offset_ele sec_chan_offset_ele; - tDot11fIEWMMInfoAp WMMInfoAp; - tDot11fIEWMMParams WMMParams; - tDot11fIEWMMCaps WMMCaps; - tDot11fIEWAPI WAPI; - tDot11fIEESERadMgmtCap ESERadMgmtCap; - tDot11fIEESETrafStrmMet ESETrafStrmMet; - tDot11fIEESETxmitPower ESETxmitPower; - tDot11fIEWscProbeRes WscProbeRes; - tDot11fIEP2PProbeRes P2PProbeRes; - tDot11fIEVHTCaps VHTCaps; - tDot11fIEVHTOperation VHTOperation; - tDot11fIEvht_transmit_power_env vht_transmit_power_env; - tDot11fIEChannelSwitchWrapper ChannelSwitchWrapper; - tDot11fIEVHTExtBssLoad VHTExtBssLoad; - tDot11fIEExtCap ExtCap; - tDot11fIEOBSSScanParameters OBSSScanParameters; - tDot11fIEfils_indication fils_indication; - tDot11fIEVendor1IE Vendor1IE; - tDot11fIEvendor_vht_ie vendor_vht_ie; - tDot11fIEVendor3IE Vendor3IE; - tDot11fIEhs20vendor_ie hs20vendor_ie; - tDot11fIEQComVendorIE QComVendorIE; - tDot11fIEESEVersion ESEVersion; - tDot11fIEMBO_IE MBO_IE; - tDot11fIEqcn_ie qcn_ie; - tDot11fIEhe_cap he_cap; - tDot11fIEhe_op he_op; - tDot11fIEhe_6ghz_band_cap he_6ghz_band_cap; - tDot11fIEbss_color_change bss_color_change; - tDot11fIEmu_edca_param_set mu_edca_param_set; - tDot11fIEesp_information esp_information; + tDot11fFfTimeStamp TimeStamp; + tDot11fFfBeaconInterval BeaconInterval; + tDot11fFfCapabilities Capabilities; + tDot11fIESSID SSID; + tDot11fIESuppRates SuppRates; + tDot11fIEFHParamSet FHParamSet; + tDot11fIEDSParams DSParams; + tDot11fIECFParams CFParams; + tDot11fIECountry Country; + tDot11fIEFHParams FHParams; + tDot11fIEFHPattTable FHPattTable; + tDot11fIEPowerConstraints PowerConstraints; + tDot11fIEChanSwitchAnn ChanSwitchAnn; + tDot11fIEext_chan_switch_ann ext_chan_switch_ann; + tDot11fIESuppOperatingClasses SuppOperatingClasses; + tDot11fIEQuiet Quiet; + tDot11fIETPCReport TPCReport; + tDot11fIEERPInfo ERPInfo; + tDot11fIEExtSuppRates ExtSuppRates; + tDot11fIERSNOpaque RSNOpaque; + tDot11fIEQBSSLoad QBSSLoad; + tDot11fIEEDCAParamSet EDCAParamSet; + tDot11fIERRMEnabledCap RRMEnabledCap; + tDot11fIEAPChannelReport APChannelReport; + tDot11fIEMobilityDomain MobilityDomain; + tDot11fIEWPA WPA; + tDot11fIEHTCaps HTCaps; + tDot11fIEHTInfo HTInfo; + tDot11fIEsec_chan_offset_ele sec_chan_offset_ele; + tDot11fIEWMMInfoAp WMMInfoAp; + tDot11fIEWMMParams WMMParams; + tDot11fIEWMMCaps WMMCaps; + tDot11fIEWAPI WAPI; + tDot11fIEESERadMgmtCap ESERadMgmtCap; + tDot11fIEESETrafStrmMet ESETrafStrmMet; + tDot11fIEESETxmitPower ESETxmitPower; + tDot11fIEWscProbeRes WscProbeRes; + tDot11fIEP2PProbeRes P2PProbeRes; + tDot11fIEVHTCaps VHTCaps; + tDot11fIEVHTOperation VHTOperation; + tDot11fIEvht_transmit_power_env vht_transmit_power_env; + tDot11fIEChannelSwitchWrapper ChannelSwitchWrapper; + tDot11fIEVHTExtBssLoad VHTExtBssLoad; + tDot11fIEExtCap ExtCap; + tDot11fIEOBSSScanParameters OBSSScanParameters; + tDot11fIEfils_indication fils_indication; + tDot11fIEVendor1IE Vendor1IE; + tDot11fIEvendor_vht_ie vendor_vht_ie; + tDot11fIEVendor3IE Vendor3IE; + tDot11fIEhs20vendor_ie hs20vendor_ie; + tDot11fIEQComVendorIE QComVendorIE; + tDot11fIEESEVersion ESEVersion; + tDot11fIEMBO_IE MBO_IE; + tDot11fIEqcn_ie qcn_ie; + tDot11fIEhe_cap he_cap; + tDot11fIEhe_op he_op; + tDot11fIEhe_6ghz_band_cap he_6ghz_band_cap; + tDot11fIEbss_color_change bss_color_change; + tDot11fIEmu_edca_param_set mu_edca_param_set; + tDot11fIEesp_information esp_information; } tDot11fProbeResponse; #define DOT11F_PROBERESPONSE (22) diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index a9914feb3432..2a51a643a241 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -267,7 +267,6 @@ typedef struct sSirProbeRespBeacon { tDot11fIEvendor_vht_ie vendor_vht_ie; uint8_t Vendor3IEPresent; tDot11fIEhs20vendor_ie hs20vendor_ie; - tDot11fIEIBSSParams IBSSParams; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE tDot11fIEQComVendorIE AvoidChannelIE; #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ @@ -483,7 +482,6 @@ typedef struct sSirEseBcnReportMandatoryIe { tSirMacFHParamSet fhParamSet; tSirMacDsParamSetIE dsParamSet; tSirMacCfParamSet cfParamSet; - tSirMacIBSSParams ibssParamSet; tSirMacTim tim; tSirMacRRMEnabledCap rmEnabledCapabilities; @@ -492,7 +490,6 @@ typedef struct sSirEseBcnReportMandatoryIe { uint8_t fhParamPresent; uint8_t dsParamsPresent; uint8_t cfPresent; - uint8_t ibssParamPresent; uint8_t timPresent; uint8_t rrmPresent; } tSirEseBcnReportMandatoryIe, *tpSirEseBcnReportMandatoryIe; 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 b39ef278865e..d63f159fdd1b 100644 --- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c +++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c @@ -24,7 +24,7 @@ * * * This file was automatically generated by 'framesc' - * Mon Mar 16 12:19:33 2020 from the following file(s): + * Sat May 16 11:34:16 2020 from the following file(s): * * dot11f.frms * @@ -4889,30 +4889,6 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, #define SigIeHTInfo (0x0040) -uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIEIBSSParams *pDst, - bool append_ie) -{ - uint32_t status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) - return DOT11F_DUPLICATE_IE; - pDst->present = 1; - if (unlikely(ielen < 2)) { - pDst->present = 0; - return DOT11F_INCOMPLETE_IE; - } - - framesntohs(pCtx, &pDst->atim, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11f_unpack_ie_ibss_params. */ - -#define SigIeIBSSParams (0x0041) - - uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, @@ -4950,7 +4926,7 @@ uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_link_identifier. */ -#define SigIeLinkIdentifier (0x0042) +#define SigIeLinkIdentifier (0x0041) static const tTLVDefn TLVS_MBO_IE[] = { @@ -5013,7 +4989,7 @@ uint32_t dot11f_unpack_ie_MBO_IE(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_MBO_IE. */ -#define SigIeMBO_IE (0x0043) +#define SigIeMBO_IE (0x0042) static const tFFDefn FFS_reportBeacon[] = { @@ -5348,7 +5324,7 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_report. */ -#define SigIeMeasurementReport (0x0044) +#define SigIeMeasurementReport (0x0043) static const tFFDefn FFS_measurement_requestBeacon[] = { @@ -5652,7 +5628,7 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_request. */ -#define SigIeMeasurementRequest (0x0045) +#define SigIeMeasurementRequest (0x0044) uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, @@ -5688,7 +5664,7 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_mobility_domain. */ -#define SigIeMobilityDomain (0x0046) +#define SigIeMobilityDomain (0x0045) static const tFFDefn FFS_NeighborReport[] = { @@ -5810,7 +5786,7 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_neighbor_report. */ -#define SigIeNeighborReport (0x0047) +#define SigIeNeighborReport (0x0046) uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, @@ -5882,7 +5858,7 @@ uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_obss_scan_parameters. */ -#define SigIeOBSSScanParameters (0x0048) +#define SigIeOBSSScanParameters (0x0047) uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, @@ -5912,7 +5888,7 @@ uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_operating_mode. */ -#define SigIeOperatingMode (0x0049) +#define SigIeOperatingMode (0x0048) static const tTLVDefn TLVS_P2PAssocReq[] = { @@ -5944,7 +5920,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_req. */ -#define SigIeP2PAssocReq (0x004a) +#define SigIeP2PAssocReq (0x0049) static const tTLVDefn TLVS_P2PAssocRes[] = { @@ -5973,7 +5949,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_res. */ -#define SigIeP2PAssocRes (0x004b) +#define SigIeP2PAssocRes (0x004a) static const tTLVDefn TLVS_P2PBeacon[] = { @@ -6005,7 +5981,7 @@ uint32_t dot11f_unpack_ie_p2_p_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_beacon. */ -#define SigIeP2PBeacon (0x004c) +#define SigIeP2PBeacon (0x004b) static const tTLVDefn TLVS_P2PBeaconProbeRes[] = { @@ -6047,7 +6023,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 (0x004d) +#define SigIeP2PBeaconProbeRes (0x004c) static const tTLVDefn TLVS_P2PDeAuth[] = { @@ -6073,7 +6049,7 @@ uint32_t dot11f_unpack_ie_p2_p_de_auth(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_de_auth. */ -#define SigIeP2PDeAuth (0x004e) +#define SigIeP2PDeAuth (0x004d) static const tTLVDefn TLVS_P2PDisAssoc[] = { @@ -6099,7 +6075,7 @@ uint32_t dot11f_unpack_ie_p2_p_dis_assoc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_dis_assoc. */ -#define SigIeP2PDisAssoc (0x004f) +#define SigIeP2PDisAssoc (0x004e) uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, @@ -6124,7 +6100,7 @@ uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_pie_opaque. */ -#define SigIeP2PIEOpaque (0x0050) +#define SigIeP2PIEOpaque (0x004f) static const tTLVDefn TLVS_P2PProbeReq[] = { @@ -6163,7 +6139,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_req. */ -#define SigIeP2PProbeReq (0x0051) +#define SigIeP2PProbeReq (0x0050) static const tTLVDefn TLVS_P2PProbeRes[] = { @@ -6202,7 +6178,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_res. */ -#define SigIeP2PProbeRes (0x0052) +#define SigIeP2PProbeRes (0x0051) uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, @@ -6234,7 +6210,7 @@ uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_pti_control. */ -#define SigIePTIControl (0x0053) +#define SigIePTIControl (0x0052) uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, @@ -6264,7 +6240,7 @@ uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_pu_buffer_status. */ -#define SigIePUBufferStatus (0x0054) +#define SigIePUBufferStatus (0x0053) uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, @@ -6296,7 +6272,7 @@ uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_caps. */ -#define SigIePowerCaps (0x0055) +#define SigIePowerCaps (0x0054) uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, @@ -6320,7 +6296,7 @@ uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_constraints. */ -#define SigIePowerConstraints (0x0056) +#define SigIePowerConstraints (0x0055) uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, @@ -6360,7 +6336,7 @@ uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qbss_load. */ -#define SigIeQBSSLoad (0x0057) +#define SigIeQBSSLoad (0x0056) uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, @@ -6392,7 +6368,7 @@ uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_QComVendorIE. */ -#define SigIeQComVendorIE (0x0058) +#define SigIeQComVendorIE (0x0057) uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, @@ -6422,7 +6398,7 @@ uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qos_caps_ap. */ -#define SigIeQOSCapsAp (0x0059) +#define SigIeQOSCapsAp (0x0058) uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, @@ -6454,7 +6430,7 @@ uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qos_caps_station. */ -#define SigIeQOSCapsStation (0x005a) +#define SigIeQOSCapsStation (0x0059) uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, @@ -6479,7 +6455,7 @@ uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qos_map_set. */ -#define SigIeQosMapSet (0x005b) +#define SigIeQosMapSet (0x005a) uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, @@ -6527,7 +6503,7 @@ uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_quiet. */ -#define SigIeQuiet (0x005c) +#define SigIeQuiet (0x005b) uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, @@ -6551,7 +6527,7 @@ uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rcpiie. */ -#define SigIeRCPIIE (0x005d) +#define SigIeRCPIIE (0x005c) static const tFFDefn FFS_RICDataDesc[] = { @@ -6627,7 +6603,7 @@ uint32_t dot11f_unpack_ie_ric_data_desc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_data_desc. */ -#define SigIeRICDataDesc (0x005e) +#define SigIeRICDataDesc (0x005d) uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, @@ -6803,7 +6779,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn. */ -#define SigIeRSN (0x005f) +#define SigIeRSN (0x005e) uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, @@ -6827,7 +6803,7 @@ uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsniie. */ -#define SigIeRSNIIE (0x0060) +#define SigIeRSNIIE (0x005f) uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, @@ -6852,7 +6828,7 @@ uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn_opaque. */ -#define SigIeRSNOpaque (0x0061) +#define SigIeRSNOpaque (0x0060) uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, @@ -6877,7 +6853,7 @@ uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_channels. */ -#define SigIeSuppChannels (0x0062) +#define SigIeSuppChannels (0x0061) uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, @@ -6902,7 +6878,7 @@ uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_operating_classes. */ -#define SigIeSuppOperatingClasses (0x0063) +#define SigIeSuppOperatingClasses (0x0062) uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, @@ -6935,7 +6911,7 @@ uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_rates. */ -#define SigIeSuppRates (0x0064) +#define SigIeSuppRates (0x0063) uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, @@ -6984,7 +6960,7 @@ uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tim. */ -#define SigIeTIM (0x0065) +#define SigIeTIM (0x0064) uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, @@ -7016,7 +6992,7 @@ uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_report. */ -#define SigIeTPCReport (0x0066) +#define SigIeTPCReport (0x0065) uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, @@ -7034,7 +7010,7 @@ uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_request. */ -#define SigIeTPCRequest (0x0067) +#define SigIeTPCRequest (0x0066) uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, @@ -7074,7 +7050,7 @@ uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_time_advertisement. */ -#define SigIeTimeAdvertisement (0x0068) +#define SigIeTimeAdvertisement (0x0067) uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, @@ -7106,7 +7082,7 @@ uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_timeout_interval. */ -#define SigIeTimeoutInterval (0x0069) +#define SigIeTimeoutInterval (0x0068) uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, @@ -7162,7 +7138,7 @@ uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vht_ext_bss_load. */ -#define SigIeVHTExtBssLoad (0x006a) +#define SigIeVHTExtBssLoad (0x0069) uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, @@ -7180,7 +7156,7 @@ uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor1_ie. */ -#define SigIeVendor1IE (0x006b) +#define SigIeVendor1IE (0x006a) uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, @@ -7198,7 +7174,7 @@ uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor3_ie. */ -#define SigIeVendor3IE (0x006c) +#define SigIeVendor3IE (0x006b) uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, @@ -7313,7 +7289,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi. */ -#define SigIeWAPI (0x006d) +#define SigIeWAPI (0x006c) uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, @@ -7338,7 +7314,7 @@ uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi_opaque. */ -#define SigIeWAPIOpaque (0x006e) +#define SigIeWAPIOpaque (0x006d) uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, @@ -7370,7 +7346,7 @@ uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfatpc. */ -#define SigIeWFATPC (0x006f) +#define SigIeWFATPC (0x006e) uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, @@ -7395,7 +7371,7 @@ uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfdie_opaque. */ -#define SigIeWFDIEOpaque (0x0070) +#define SigIeWFDIEOpaque (0x006f) uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, @@ -7437,7 +7413,7 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmm_caps. */ -#define SigIeWMMCaps (0x0071) +#define SigIeWMMCaps (0x0070) uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, @@ -7473,7 +7449,7 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmm_info_ap. */ -#define SigIeWMMInfoAp (0x0072) +#define SigIeWMMInfoAp (0x0071) uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, @@ -7513,7 +7489,7 @@ uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmm_info_station. */ -#define SigIeWMMInfoStation (0x0073) +#define SigIeWMMInfoStation (0x0072) uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, @@ -7685,7 +7661,7 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmm_params. */ -#define SigIeWMMParams (0x0074) +#define SigIeWMMParams (0x0073) uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, @@ -7794,7 +7770,7 @@ uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa. */ -#define SigIeWPA (0x0075) +#define SigIeWPA (0x0074) uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, @@ -7819,7 +7795,7 @@ uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa_opaque. */ -#define SigIeWPAOpaque (0x0076) +#define SigIeWPAOpaque (0x0075) static const tTLVDefn TLVS_WSC[] = { @@ -7910,7 +7886,7 @@ uint32_t dot11f_unpack_ie_wsc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc. */ -#define SigIeWSC (0x0077) +#define SigIeWSC (0x0076) static const tTLVDefn TLVS_WscAssocReq[] = { @@ -7942,7 +7918,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_req. */ -#define SigIeWscAssocReq (0x0078) +#define SigIeWscAssocReq (0x0077) static const tTLVDefn TLVS_WscAssocRes[] = { @@ -7974,7 +7950,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_res. */ -#define SigIeWscAssocRes (0x0079) +#define SigIeWscAssocRes (0x0078) static const tTLVDefn TLVS_WscBeacon[] = { @@ -8027,7 +8003,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon. */ -#define SigIeWscBeacon (0x007a) +#define SigIeWscBeacon (0x0079) static const tTLVDefn TLVS_WscBeaconProbeRes[] = { @@ -8105,7 +8081,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon_probe_res. */ -#define SigIeWscBeaconProbeRes (0x007b) +#define SigIeWscBeaconProbeRes (0x007a) uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, @@ -8130,7 +8106,7 @@ uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_ie_opaque. */ -#define SigIeWscIEOpaque (0x007c) +#define SigIeWscIEOpaque (0x007b) static const tTLVDefn TLVS_WscProbeReq[] = { @@ -8203,7 +8179,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_req. */ -#define SigIeWscProbeReq (0x007d) +#define SigIeWscProbeReq (0x007c) static const tTLVDefn TLVS_WscProbeRes[] = { @@ -8281,7 +8257,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_res. */ -#define SigIeWscProbeRes (0x007e) +#define SigIeWscProbeRes (0x007d) static const tTLVDefn TLVS_WscReassocRes[] = { @@ -8313,7 +8289,7 @@ uint32_t dot11f_unpack_ie_wsc_reassoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_reassoc_res. */ -#define SigIeWscReassocRes (0x007f) +#define SigIeWscReassocRes (0x007e) uint32_t dot11f_unpack_ie_addba_extn_element(tpAniSirGlobal pCtx, @@ -8341,7 +8317,7 @@ uint32_t dot11f_unpack_ie_addba_extn_element(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_addba_extn_element. */ -#define SigIeaddba_extn_element (0x0080) +#define SigIeaddba_extn_element (0x007f) uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, @@ -8376,7 +8352,7 @@ uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_bss_color_change. */ -#define SigIebss_color_change (0x0081) +#define SigIebss_color_change (0x0080) uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx, @@ -8404,7 +8380,7 @@ uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_dh_parameter_element. */ -#define SigIedh_parameter_element (0x0082) +#define SigIedh_parameter_element (0x0081) uint32_t dot11f_unpack_ie_esp_information(tpAniSirGlobal pCtx, @@ -8429,7 +8405,7 @@ uint32_t dot11f_unpack_ie_esp_information(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_esp_information. */ -#define SigIeesp_information (0x0083) +#define SigIeesp_information (0x0082) uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, @@ -8477,7 +8453,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 (0x0084) +#define SigIeext_chan_switch_ann (0x0083) uint32_t dot11f_unpack_ie_fils_assoc_delay_info(tpAniSirGlobal pCtx, @@ -8501,7 +8477,7 @@ uint32_t dot11f_unpack_ie_fils_assoc_delay_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_assoc_delay_info. */ -#define SigIefils_assoc_delay_info (0x0085) +#define SigIefils_assoc_delay_info (0x0084) uint32_t dot11f_unpack_ie_fils_hlp_container(tpAniSirGlobal pCtx, @@ -8537,7 +8513,7 @@ uint32_t dot11f_unpack_ie_fils_hlp_container(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_hlp_container. */ -#define SigIefils_hlp_container (0x0086) +#define SigIefils_hlp_container (0x0085) uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, @@ -8575,7 +8551,7 @@ uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_indication. */ -#define SigIefils_indication (0x0087) +#define SigIefils_indication (0x0086) uint32_t dot11f_unpack_ie_fils_kde(tpAniSirGlobal pCtx, @@ -8603,7 +8579,7 @@ uint32_t dot11f_unpack_ie_fils_kde(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_kde. */ -#define SigIefils_kde (0x0088) +#define SigIefils_kde (0x0087) uint32_t dot11f_unpack_ie_fils_key_confirmation(tpAniSirGlobal pCtx, @@ -8623,7 +8599,7 @@ uint32_t dot11f_unpack_ie_fils_key_confirmation(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_key_confirmation. */ -#define SigIefils_key_confirmation (0x0089) +#define SigIefils_key_confirmation (0x0088) uint32_t dot11f_unpack_ie_fils_nonce(tpAniSirGlobal pCtx, @@ -8647,7 +8623,7 @@ uint32_t dot11f_unpack_ie_fils_nonce(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_nonce. */ -#define SigIefils_nonce (0x008a) +#define SigIefils_nonce (0x0089) uint32_t dot11f_unpack_ie_fils_public_key(tpAniSirGlobal pCtx, @@ -8675,7 +8651,7 @@ uint32_t dot11f_unpack_ie_fils_public_key(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_public_key. */ -#define SigIefils_public_key (0x008b) +#define SigIefils_public_key (0x008a) uint32_t dot11f_unpack_ie_fils_session(tpAniSirGlobal pCtx, @@ -8699,7 +8675,7 @@ uint32_t dot11f_unpack_ie_fils_session(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_session. */ -#define SigIefils_session (0x008c) +#define SigIefils_session (0x008b) uint32_t dot11f_unpack_ie_fils_wrapped_data(tpAniSirGlobal pCtx, @@ -8719,7 +8695,7 @@ uint32_t dot11f_unpack_ie_fils_wrapped_data(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_wrapped_data. */ -#define SigIefils_wrapped_data (0x008d) +#define SigIefils_wrapped_data (0x008c) uint32_t dot11f_unpack_ie_fragment_ie(tpAniSirGlobal pCtx, @@ -8739,7 +8715,7 @@ uint32_t dot11f_unpack_ie_fragment_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fragment_ie. */ -#define SigIefragment_ie (0x008e) +#define SigIefragment_ie (0x008d) uint32_t dot11f_unpack_ie_he_6ghz_band_cap(tpAniSirGlobal pCtx, @@ -8772,7 +8748,7 @@ uint32_t dot11f_unpack_ie_he_6ghz_band_cap(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_he_6ghz_band_cap. */ -#define SigIehe_6ghz_band_cap (0x008f) +#define SigIehe_6ghz_band_cap (0x008e) uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, @@ -9017,7 +8993,7 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_he_cap. */ -#define SigIehe_cap (0x0090) +#define SigIehe_cap (0x008f) uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, @@ -9169,7 +9145,7 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_he_op. */ -#define SigIehe_op (0x0091) +#define SigIehe_op (0x0090) uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, @@ -9226,7 +9202,7 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_hs20vendor_ie. */ -#define SigIehs20vendor_ie (0x0092) +#define SigIehs20vendor_ie (0x0091) uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, @@ -9257,7 +9233,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht2040_bss_coexistence. */ -#define SigIeht2040_bss_coexistence (0x0093) +#define SigIeht2040_bss_coexistence (0x0092) uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, @@ -9290,7 +9266,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 (0x0094) +#define SigIeht2040_bss_intolerant_report (0x0093) uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, @@ -9442,7 +9418,7 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_mu_edca_param_set. */ -#define SigIemu_edca_param_set (0x0095) +#define SigIemu_edca_param_set (0x0094) uint32_t dot11f_unpack_ie_osen_ie(tpAniSirGlobal pCtx, @@ -9462,7 +9438,7 @@ uint32_t dot11f_unpack_ie_osen_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_osen_ie. */ -#define SigIeosen_ie (0x0096) +#define SigIeosen_ie (0x0095) static const tFFDefn FFS_qcn_ie[] = { @@ -9508,7 +9484,7 @@ uint32_t dot11f_unpack_ie_qcn_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qcn_ie. */ -#define SigIeqcn_ie (0x0097) +#define SigIeqcn_ie (0x0096) uint32_t dot11f_unpack_ie_roaming_consortium_sel(tpAniSirGlobal pCtx, @@ -9528,7 +9504,7 @@ uint32_t dot11f_unpack_ie_roaming_consortium_sel(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_roaming_consortium_sel. */ -#define SigIeroaming_consortium_sel (0x0098) +#define SigIeroaming_consortium_sel (0x0097) uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, @@ -9552,7 +9528,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 (0x0099) +#define SigIesec_chan_offset_ele (0x0098) static const tFFDefn FFS_vendor_vht_ie[] = { @@ -9601,7 +9577,7 @@ uint32_t dot11f_unpack_ie_vendor_vht_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor_vht_ie. */ -#define SigIevendor_vht_ie (0x009a) +#define SigIevendor_vht_ie (0x0099) static const tFFDefn FFS_AddTSRequest[] = { @@ -10156,9 +10132,6 @@ static const tIEDefn IES_Beacon[] = { { offsetof(tDot11fBeacon, CFParams), offsetof(tDot11fIECFParams, present), 0, "CFParams", 0, 8, 8, SigIeCFParams, {0, 0, 0, 0, 0}, 0, DOT11F_EID_CFPARAMS, 0, 0, }, - { offsetof(tDot11fBeacon, IBSSParams), offsetof(tDot11fIEIBSSParams, - present), 0, "IBSSParams", 0, 4, 4, SigIeIBSSParams, {0, 0, 0, 0, 0}, - 0, DOT11F_EID_IBSSPARAMS, 0, 0, }, { offsetof(tDot11fBeacon, TIM), offsetof(tDot11fIETIM, present), 0, "TIM", 0, 6, 256, SigIeTIM, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIM, 0, 0, }, { offsetof(tDot11fBeacon, Country), offsetof(tDot11fIECountry, present), 0, @@ -10380,9 +10353,6 @@ static const tIEDefn IES_Beacon1[] = { { offsetof(tDot11fBeacon1, DSParams), offsetof(tDot11fIEDSParams, present), 0, "DSParams", 0, 3, 3, SigIeDSParams, {0, 0, 0, 0, 0}, 0, DOT11F_EID_DSPARAMS, 0, 0, }, - { offsetof(tDot11fBeacon1, IBSSParams), offsetof(tDot11fIEIBSSParams, - present), 0, "IBSSParams", 0, 4, 4, SigIeIBSSParams, {0, 0, 0, 0, 0}, - 0, DOT11F_EID_IBSSPARAMS, 0, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; uint32_t dot11f_unpack_beacon1(tpAniSirGlobal pCtx, @@ -10614,9 +10584,6 @@ static const tIEDefn IES_BeaconIEs[] = { { offsetof(tDot11fBeaconIEs, CFParams), offsetof(tDot11fIECFParams, present), 0, "CFParams", 0, 8, 8, SigIeCFParams, {0, 0, 0, 0, 0}, 0, DOT11F_EID_CFPARAMS, 0, 0, }, - { offsetof(tDot11fBeaconIEs, IBSSParams), offsetof(tDot11fIEIBSSParams, - present), 0, "IBSSParams", 0, 4, 4, SigIeIBSSParams, {0, 0, 0, 0, 0}, - 0, DOT11F_EID_IBSSPARAMS, 0, 0, }, { offsetof(tDot11fBeaconIEs, TIM), offsetof(tDot11fIETIM, present), 0, "TIM", 0, 6, 256, SigIeTIM, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIM, 0, 0, }, { offsetof(tDot11fBeaconIEs, Country), offsetof(tDot11fIECountry, @@ -11276,10 +11243,6 @@ static const tIEDefn IES_ProbeResponse[] = { { offsetof(tDot11fProbeResponse, CFParams), offsetof(tDot11fIECFParams, present), 0, "CFParams", 0, 8, 8, SigIeCFParams, {0, 0, 0, 0, 0}, 0, DOT11F_EID_CFPARAMS, 0, 0, }, - { offsetof(tDot11fProbeResponse, IBSSParams), - offsetof(tDot11fIEIBSSParams, present), 0, "IBSSParams", - 0, 4, 4, SigIeIBSSParams, {0, 0, 0, 0, 0}, - 0, DOT11F_EID_IBSSPARAMS, 0, 0, }, { offsetof(tDot11fProbeResponse, Country), offsetof(tDot11fIECountry, present), 0, "Country", 0, 5, 257, SigIeCountry, {0, 0, 0, 0, 0}, 0, DOT11F_EID_COUNTRY, 0, 0, }, @@ -13903,16 +13866,6 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, countOffset), append_ie); break; - case SigIeIBSSParams: - status |= - dot11f_unpack_ie_ibss_params( - pCtx, pBufRemaining, len, - (tDot11fIEIBSSParams *) - (pFrm + pIe->offset + - sizeof(tDot11fIEIBSSParams) * - countOffset), - append_ie); - break; case SigIeLinkIdentifier: status |= dot11f_unpack_ie_link_identifier( @@ -17244,13 +17197,6 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; - case SigIeIBSSParams: - offset = sizeof(tDot11fIEIBSSParams); - byteCount = 2; - pIePresent = ((tDot11fIEIBSSParams *) - (pFrm + pIe->offset + offset * i))-> - present; - break; case SigIeLinkIdentifier: offset = sizeof(tDot11fIELinkIdentifier); byteCount = 18; @@ -23062,35 +23008,6 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_ht_info. */ -uint32_t dot11f_pack_ie_ibss_params(tpAniSirGlobal pCtx, - tDot11fIEIBSSParams *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 = 6; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - frameshtons(pCtx, pBuf, pSrc->atim, 0); - *pnConsumed += 2; - /* fieldsEndFlag = 1 */ - break; - } - (void)pCtx; - if (pIeLen) { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_ibss_params. */ - uint32_t dot11f_pack_ie_link_identifier(tpAniSirGlobal pCtx, tDot11fIELinkIdentifier *pSrc, uint8_t *pBuf, @@ -28966,14 +28883,6 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEHTInfo) * i), pBufRemaining, nBufRemaining, &len); break; - case SigIeIBSSParams: - status |= - dot11f_pack_ie_ibss_params( - pCtx, (tDot11fIEIBSSParams *) - (pSrc + pIe->offset + - sizeof(tDot11fIEIBSSParams) * i), - pBufRemaining, nBufRemaining, &len); - break; case SigIeLinkIdentifier: status |= dot11f_pack_ie_link_identifier( diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 61832441a3ed..f73515f58805 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -3584,13 +3584,6 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, numBytes += 1 + 1 + WLAN_CF_PARAM_IE_MAX_LEN; } - if (pBies->IBSSParams.present) { - eseBcnReportMandatoryIe.ibssParamPresent = 1; - eseBcnReportMandatoryIe.ibssParamSet.atim = - pBies->IBSSParams.atim; - numBytes += 1 + 1 + WLAN_IBSS_IE_MAX_LEN; - } - if (pBies->TIM.present) { eseBcnReportMandatoryIe.timPresent = 1; eseBcnReportMandatoryIe.tim.dtimCount = pBies->TIM.dtim_count; @@ -3713,24 +3706,6 @@ sir_beacon_ie_ese_bcn_report(struct mac_context *mac, freeBytes -= (1 + 1 + WLAN_CF_PARAM_IE_MAX_LEN); } - /* Fill IBSS Parameter set IE */ - if (eseBcnReportMandatoryIe.ibssParamPresent) { - if (freeBytes < (1 + 1 + WLAN_IBSS_IE_MAX_LEN)) { - pe_err("Insufficient memory to copy IBSS IE"); - retStatus = QDF_STATUS_E_FAILURE; - goto err_bcnrep; - } - *pos = WLAN_ELEMID_IBSSPARMS; - pos++; - *pos = WLAN_IBSS_IE_MAX_LEN; - pos++; - qdf_mem_copy(pos, - (uint8_t *) &eseBcnReportMandatoryIe.ibssParamSet. - atim, WLAN_IBSS_IE_MAX_LEN); - pos += WLAN_IBSS_IE_MAX_LEN; - freeBytes -= (1 + 1 + WLAN_IBSS_IE_MAX_LEN); - } - /* Fill TIM IE */ if (eseBcnReportMandatoryIe.timPresent) { if (freeBytes < (1 + 1 + SIR_MAC_TIM_EID_MIN)) { @@ -4388,12 +4363,6 @@ sir_convert_beacon_frame2_struct(struct mac_context *mac, &pBeacon->WiderBWChanSwitchAnn, sizeof(tDot11fIEWiderBWChanSwitchAnn)); } - /* IBSS Peer Params */ - if (pBeacon->IBSSParams.present) { - pBeaconStruct->IBSSParams.present = 1; - qdf_mem_copy(&pBeaconStruct->IBSSParams, &pBeacon->IBSSParams, - sizeof(tDot11fIEIBSSParams)); - } pBeaconStruct->Vendor1IEPresent = pBeacon->Vendor1IE.present; pBeaconStruct->Vendor3IEPresent = pBeacon->Vendor3IE.present;