From 819158d0fbd593692df926aab0fec5a397aaca8a Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Tue, 16 Jan 2018 10:56:45 -0800 Subject: [PATCH] qcacld-3.0: Fix HE PPET parsing/packing for OTA frames HE PPET is an optional field within HE Capability IE, however current frame parser code was treating it as optiona IE and inserting EID, length for it causing in-correct PPET values. Fix frame parser code by treating PPET as just another data field instead of IE. Change-Id: I1903d99daf5eb00e47f42485886532551e061982 CRs-Fixed: 2172820 --- core/hdd/src/wlan_hdd_he.c | 9 +- core/mac/inc/sir_api.h | 9 + core/mac/inc/wni_cfg.h | 2 +- core/mac/src/cfg/cfgUtil/dot11f.frms | 16 +- core/mac/src/include/dot11f.h | 224 +- core/mac/src/include/parser_api.h | 16 + core/mac/src/pe/lim/lim_utils.c | 19 +- .../mac/src/sys/legacy/src/utils/src/dot11f.c | 3101 ++++++++--------- .../src/sys/legacy/src/utils/src/parser_api.c | 20 +- core/sme/src/csr/csr_api_roam.c | 7 +- core/wma/inc/wma_tgt_cfg.h | 4 +- core/wma/src/wma_he.c | 101 +- 12 files changed, 1688 insertions(+), 1840 deletions(-) diff --git a/core/hdd/src/wlan_hdd_he.c b/core/hdd/src/wlan_hdd_he.c index c195acda2450..346904e882d3 100644 --- a/core/hdd/src/wlan_hdd_he.c +++ b/core/hdd/src/wlan_hdd_he.c @@ -54,7 +54,6 @@ void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx, struct wma_tgt_cfg *cfg) { uint8_t chan_width; - uint32_t ppet_size = sizeof(tDot11fIEppe_threshold); QDF_STATUS status; tDot11fIEhe_cap *he_cap = &cfg->he_cap; @@ -203,14 +202,14 @@ void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx, /* PPET can not be configured by user - Set per band values from FW */ status = sme_cfg_set_str(hdd_ctx->hHal, WNI_CFG_HE_PPET_2G, - (void *)&cfg->ppet_2g, ppet_size); + cfg->ppet_2g, HE_MAX_PPET_SIZE); if (status == QDF_STATUS_E_FAILURE) - hdd_alert("could not set HE PPET"); + hdd_alert("could not set 2G HE PPET"); status = sme_cfg_set_str(hdd_ctx->hHal, WNI_CFG_HE_PPET_5G, - (void *)&cfg->ppet_5g, ppet_size); + cfg->ppet_5g, HE_MAX_PPET_SIZE); if (status == QDF_STATUS_E_FAILURE) - hdd_alert("could not set HE PPET"); + hdd_alert("could not set 5G HE PPET"); } void wlan_hdd_check_11ax_support(struct hdd_beacon_data *beacon, diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index fd0effce1dea..a01e17621370 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -7429,6 +7429,15 @@ struct wow_enable_params { #define HE_PPET_SIZE 3 #define HE_BYTE_SIZE 8 +struct ppet_hdr { + uint8_t nss:3; + uint8_t ru_idx_mask:4; + uint8_t remaining:1; +}; + +/* MAX PPET size = 7 bits + (max_nss X max_ru_number X 6) = 25 bytes */ +#define HE_MAX_PPET_SIZE WNI_CFG_HE_PPET_LEN + #define HE_MAX_PHY_CAP_SIZE 3 #define HE_CH_WIDTH_GET_BIT(ch_wd, bit) (((ch_wd) >> (bit)) & 1) diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h index 3d41783f823b..4c6bf4fb264f 100644 --- a/core/mac/inc/wni_cfg.h +++ b/core/mac/inc/wni_cfg.h @@ -413,7 +413,7 @@ enum { #define WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN 255 #define WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN 255 #define WNI_CFG_WPS_UUID_LEN 16 -#define WNI_CFG_HE_PPET_LEN 27 +#define WNI_CFG_HE_PPET_LEN 25 /* * Integer parameter min/max/default values diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms index c36f502ba243..3b6fe0955469 100644 --- a/core/mac/src/cfg/cfgUtil/dot11f.frms +++ b/core/mac/src/cfg/cfgUtil/dot11f.frms @@ -2808,8 +2808,6 @@ IE MeasurementRequest (EID_MEAS_REQUEST) // 7.3.2.21 }; } -const SUB_EID_PPET = 1; - IE he_cap (EID_EXTN_ID_ELEMENT) OUI (0x23) { { @@ -2906,15 +2904,13 @@ IE he_cap (EID_EXTN_ID_ELEMENT) OUI (0x23) tx_he_mcs_map_160[2][0..1] COUNTIS chan_width_2; rx_he_mcs_map_80_80[2][0..1] COUNTIS chan_width_3; tx_he_mcs_map_80_80[2][0..1] COUNTIS chan_width_3; - OPTIE IE ppe_threshold (SUB_EID_PPET) + OPTIONAL UNION ppet (DISCRIMINATOR ppet_present) { - { - nss_count:3; - ru_idx_mask:4; - ppet_b1:1; - } - ppet[1..24]; - } + ppe_threshold (ppet_present IS 1) + { + ppe_th[1..25]; + } + }; } IE he_op (EID_EXTN_ID_ELEMENT) OUI (0x24) diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index c40fee0cb41e..bf5d7575bd2c 100644 --- a/core/mac/src/include/dot11f.h +++ b/core/mac/src/include/dot11f.h @@ -35,7 +35,7 @@ * * * This file was automatically generated by 'framesc' - * Tue Jan 16 10:54:27 2018 from the following file(s): + * Thu Jan 25 09:35:43 2018 from the following file(s): * * dot11f.frms * @@ -2705,49 +2705,6 @@ uint32_t dot11f_get_packed_ie_R1KH_ID( }; /* End extern "C". */ #endif /* C++ */ -/* EID 1 (0x01) */ -typedef struct sDot11fIEppe_threshold { - uint8_t present; - uint8_t nss_count:3; - uint8_t ru_idx_mask:4; - uint8_t ppet_b1:1; - uint8_t num_ppet; - uint8_t ppet[24]; -} tDot11fIEppe_threshold; - -#define DOT11F_EID_PPE_THRESHOLD (1) - -/* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_PPE_THRESHOLD_MIN_LEN (2) - -#define DOT11F_IE_PPE_THRESHOLD_MAX_LEN (25) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -uint32_t dot11f_unpack_ie_ppe_threshold( - tpAniSirGlobal, - uint8_t *, - uint8_t, - tDot11fIEppe_threshold*, - bool); - -uint32_t dot11f_pack_ie_ppe_threshold( - tpAniSirGlobal, - tDot11fIEppe_threshold *, - uint8_t *, - uint32_t, - uint32_t*); - -uint32_t dot11f_get_packed_ie_ppe_threshold( - tpAniSirGlobal, - tDot11fIEppe_threshold *, - uint32_t*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ - /* EID 51 (0x33) */ typedef struct sDot11fIEAPChannelReport { uint8_t present; @@ -8716,92 +8673,97 @@ uint32_t dot11f_get_packed_ie_fragment_ie( /* EID 255 (0xff) Extended EID 35 (0x23) */ typedef struct sDot11fIEhe_cap { - uint8_t present; - uint32_t htc_he:1; - uint32_t twt_request:1; - uint32_t twt_responder:1; - uint32_t fragmentation:2; - uint32_t max_num_frag_msdu:3; - uint32_t min_frag_size:2; - uint32_t trigger_frm_mac_pad:2; - uint32_t multi_tid_aggr:3; - uint32_t he_link_adaptation:2; - uint32_t all_ack:1; - uint32_t ul_mu_rsp_sched:1; - uint32_t a_bsr:1; - uint32_t broadcast_twt:1; - uint32_t ba_32bit_bitmap:1; - uint32_t mu_cascade:1; - uint32_t ack_enabled_multitid:1; - uint32_t dl_mu_ba:1; - uint32_t omi_a_ctrl:1; - uint32_t ofdma_ra:1; - uint32_t max_ampdu_len:2; - uint32_t amsdu_frag:1; - uint32_t flex_twt_sched:1; - uint32_t rx_ctrl_frame:1; - uint8_t bsrp_ampdu_aggr:1; - uint8_t qtp:1; - uint8_t a_bqr:1; - uint8_t sr_responder:1; - uint8_t ndp_feedback_supp:1; - uint8_t ops_supp:1; - uint8_t amsdu_in_ampdu:1; - uint8_t reserved1:1; - uint32_t dual_band:1; - uint32_t chan_width_0:1; - uint32_t chan_width_1:1; - uint32_t chan_width_2:1; - uint32_t chan_width_3:1; - uint32_t chan_width_4:1; - uint32_t chan_width_5:1; - uint32_t chan_width_6:1; - uint32_t rx_pream_puncturing:4; - uint32_t device_class:1; - uint32_t ldpc_coding:1; - uint32_t he_1x_ltf_800_gi_ppdu:1; - uint32_t midamble_rx_max_nsts:2; - uint32_t he_4x_ltf_3200_gi_ndp:1; - uint32_t stbc_lt_80mhz:2; - uint32_t doppler:2; - uint32_t ul_mu:2; - uint32_t dcm_enc_tx:3; - uint32_t dcm_enc_rx:3; - uint32_t ul_he_mu:1; - uint32_t su_beamformer:1; - uint32_t su_beamformee:1; - uint32_t mu_beamformer:1; - uint32_t bfee_sts_lt_80:3; - uint32_t bfee_sts_gt_80:3; - uint32_t num_sounding_lt_80:3; - uint32_t num_sounding_gt_80:3; - uint32_t su_feedback_tone16:1; - uint32_t mu_feedback_tone16:1; - uint32_t codebook_su:1; - uint32_t codebook_mu:1; - uint32_t beamforming_feedback:3; - uint32_t he_er_su_ppdu:1; - uint32_t dl_mu_mimo_part_bw:1; - uint32_t ppet_present:1; - uint32_t srp:1; - uint32_t power_boost:1; - uint32_t he_ltf_800_gi_4x:1; - uint32_t max_nc:3; - uint32_t stbc_gt_80mhz:2; - uint8_t er_he_ltf_800_gi_4x:1; - uint8_t he_ppdu_20_in_40Mhz_2G:1; - uint8_t he_ppdu_20_in_160_80p80Mhz:1; - uint8_t he_ppdu_80_in_160_80p80Mhz:1; - uint8_t er_1x_he_ltf_gi:1; - uint8_t midamble_rx_1x_he_ltf:1; - uint8_t reserved2:2; - uint16_t rx_he_mcs_map_lt_80; - uint16_t tx_he_mcs_map_lt_80; - uint8_t rx_he_mcs_map_160[1][2]; - uint8_t tx_he_mcs_map_160[1][2]; - uint8_t rx_he_mcs_map_80_80[1][2]; - uint8_t tx_he_mcs_map_80_80[1][2]; - tDot11fIEppe_threshold ppe_threshold; + uint8_t present; + uint32_t htc_he:1; + uint32_t twt_request:1; + uint32_t twt_responder:1; + uint32_t fragmentation:2; + uint32_t max_num_frag_msdu:3; + uint32_t min_frag_size:2; + uint32_t trigger_frm_mac_pad:2; + uint32_t multi_tid_aggr:3; + uint32_t he_link_adaptation:2; + uint32_t all_ack:1; + uint32_t ul_mu_rsp_sched:1; + uint32_t a_bsr:1; + uint32_t broadcast_twt:1; + uint32_t ba_32bit_bitmap:1; + uint32_t mu_cascade:1; + uint32_t ack_enabled_multitid:1; + uint32_t dl_mu_ba:1; + uint32_t omi_a_ctrl:1; + uint32_t ofdma_ra:1; + uint32_t max_ampdu_len:2; + uint32_t amsdu_frag:1; + uint32_t flex_twt_sched:1; + uint32_t rx_ctrl_frame:1; + uint8_t bsrp_ampdu_aggr:1; + uint8_t qtp:1; + uint8_t a_bqr:1; + uint8_t sr_responder:1; + uint8_t ndp_feedback_supp:1; + uint8_t ops_supp:1; + uint8_t amsdu_in_ampdu:1; + uint8_t reserved1:1; + uint32_t dual_band:1; + uint32_t chan_width_0:1; + uint32_t chan_width_1:1; + uint32_t chan_width_2:1; + uint32_t chan_width_3:1; + uint32_t chan_width_4:1; + uint32_t chan_width_5:1; + uint32_t chan_width_6:1; + uint32_t rx_pream_puncturing:4; + uint32_t device_class:1; + uint32_t ldpc_coding:1; + uint32_t he_1x_ltf_800_gi_ppdu:1; + uint32_t midamble_rx_max_nsts:2; + uint32_t he_4x_ltf_3200_gi_ndp:1; + uint32_t stbc_lt_80mhz:2; + uint32_t doppler:2; + uint32_t ul_mu:2; + uint32_t dcm_enc_tx:3; + uint32_t dcm_enc_rx:3; + uint32_t ul_he_mu:1; + uint32_t su_beamformer:1; + uint32_t su_beamformee:1; + uint32_t mu_beamformer:1; + uint32_t bfee_sts_lt_80:3; + uint32_t bfee_sts_gt_80:3; + uint32_t num_sounding_lt_80:3; + uint32_t num_sounding_gt_80:3; + uint32_t su_feedback_tone16:1; + uint32_t mu_feedback_tone16:1; + uint32_t codebook_su:1; + uint32_t codebook_mu:1; + uint32_t beamforming_feedback:3; + uint32_t he_er_su_ppdu:1; + uint32_t dl_mu_mimo_part_bw:1; + uint32_t ppet_present:1; + uint32_t srp:1; + uint32_t power_boost:1; + uint32_t he_ltf_800_gi_4x:1; + uint32_t max_nc:3; + uint32_t stbc_gt_80mhz:2; + uint8_t er_he_ltf_800_gi_4x:1; + uint8_t he_ppdu_20_in_40Mhz_2G:1; + uint8_t he_ppdu_20_in_160_80p80Mhz:1; + uint8_t he_ppdu_80_in_160_80p80Mhz:1; + uint8_t er_1x_he_ltf_gi:1; + uint8_t midamble_rx_1x_he_ltf:1; + uint8_t reserved2:2; + uint16_t rx_he_mcs_map_lt_80; + uint16_t tx_he_mcs_map_lt_80; + uint8_t rx_he_mcs_map_160[1][2]; + uint8_t tx_he_mcs_map_160[1][2]; + uint8_t rx_he_mcs_map_80_80[1][2]; + uint8_t tx_he_mcs_map_80_80[1][2]; + union { + struct { + uint8_t num_ppe_th; + uint8_t ppe_th[25]; + } ppe_threshold; /* ppet_present = 1 */ + } ppet; } tDot11fIEhe_cap; #define DOT11F_EID_HE_CAP (255) @@ -8809,7 +8771,7 @@ typedef struct sDot11fIEhe_cap { /* N.B. These #defines do *not* include the EID & length */ #define DOT11F_IE_HE_CAP_MIN_LEN (18) -#define DOT11F_IE_HE_CAP_MAX_LEN (53) +#define DOT11F_IE_HE_CAP_MAX_LEN (51) #ifdef __cplusplus extern "C" { diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index f3d3716aa4c9..72ba24a2a912 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -1223,4 +1223,20 @@ uint32_t sir_unpack_beacon_ie(tpAniSirGlobal mac_ctx, uint8_t *buf, uint32_t buf_len, tDot11fBeaconIEs *frame, bool append_ie); +/** + * lim_truncate_ppet: truncates ppet of trailling zeros + * @ppet: ppet to truncate + * max_len: max length of ppet + * + * Return: new length after truncation + */ +static inline uint32_t lim_truncate_ppet(uint8_t *ppet, uint32_t max_len) +{ + while (max_len) { + if (ppet[max_len - 1]) + break; + max_len--; + } + return max_len; +} #endif /* __PARSE_H__ */ diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 45ce7527e11b..d2311159641d 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -7391,6 +7391,7 @@ void lim_copy_join_req_he_cap(tpPESession session, void lim_log_he_cap(tpAniSirGlobal mac, tDot11fIEhe_cap *he_cap) { uint8_t chan_width; + struct ppet_hdr *hdr; if (!he_cap->present) return; @@ -7530,22 +7531,12 @@ void lim_log_he_cap(tpAniSirGlobal mac, tDot11fIEhe_cap *he_cap) pe_debug("\tTx MCS map for <= 80+80 Mhz: 0x%04x", *((uint16_t *)he_cap->tx_he_mcs_map_80_80)); - pe_debug("\t ppe_th: present: %d, nss_count: %d, ru_idx_msk: %d", - he_cap->ppe_threshold.present, - he_cap->ppe_threshold.nss_count, - he_cap->ppe_threshold.ru_idx_mask); + hdr = (struct ppet_hdr *)&he_cap->ppet; + pe_debug("\t ppe_th:: nss_count: %d, ru_idx_msk: %d", + hdr->nss, hdr->ru_idx_mask); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - &he_cap->ppe_threshold, sizeof(tDot11fIEppe_threshold)); - - /* HE PPET */ - if (!he_cap->ppet_present) - return; - - if (!he_cap->ppe_threshold.present) { - pe_debug(FL("PPET is not present. Invalid IE")); - return; - } + &he_cap->ppet, HE_MAX_PPET_SIZE); } void lim_log_he_op(tpAniSirGlobal mac, tDot11fIEhe_op *he_ops) 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 c296099afd45..6872a579e1da 100644 --- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c +++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c @@ -33,7 +33,7 @@ * * * This file was automatically generated by 'framesc' - * Tue Jan 16 10:54:27 2018 from the following file(s): + * Thu Jan 25 09:35:43 2018 from the following file(s): * * dot11f.frms * @@ -1624,45 +1624,6 @@ uint32_t dot11f_unpack_ie_r1_kh_id(tpAniSirGlobal pCtx, #define SigIeR1KH_ID (0x0004) -uint32_t dot11f_unpack_ie_ppe_threshold(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIEppe_threshold *pDst, - bool append_ie) -{ - uint8_t ru_mask, ru_count; - uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp13__; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) - status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - tmp13__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->nss_count = tmp13__ >> 0 & 0x7; - pDst->ru_idx_mask = tmp13__ >> 3 & 0xf; - pDst->ppet_b1 = tmp13__ >> 7 & 0x1; - pDst->num_ppet = (uint8_t)(ielen); - ru_mask = pDst->ru_idx_mask; - for (ru_count = 0; ru_mask; ru_mask >>= 1) - if (ru_mask & 0x1) - ru_count++; - - if ((ielen > 24) || - (ielen != ((pDst->nss_count + 1) * ru_count * 6 - 1) / 8 + 1)) { - pDst->present = 0; - return DOT11F_SKIPPED_BAD_IE; - } - - DOT11F_MEMCPY(pCtx, pDst->ppet, pBuf, (ielen)); - (void)pCtx; - return status; -} /* End dot11f_unpack_ie_ppe_threshold. */ - -#define SigIeppe_threshold (0x0005) - - uint32_t dot11f_unpack_ie_ap_channel_report(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, @@ -1688,7 +1649,7 @@ uint32_t dot11f_unpack_ie_ap_channel_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ap_channel_report. */ -#define SigIeAPChannelReport (0x0006) +#define SigIeAPChannelReport (0x0005) uint32_t dot11f_unpack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx, @@ -1707,7 +1668,7 @@ uint32_t dot11f_unpack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_bcn_reporting_detail. */ -#define SigIeBcnReportingDetail (0x0007) +#define SigIeBcnReportingDetail (0x0006) uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx, @@ -1732,7 +1693,7 @@ uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_beacon_report_frm_body. */ -#define SigIeBeaconReportFrmBody (0x0008) +#define SigIeBeaconReportFrmBody (0x0007) uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx, @@ -1754,7 +1715,7 @@ uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_beacon_reporting. */ -#define SigIeBeaconReporting (0x0009) +#define SigIeBeaconReporting (0x0008) uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx, @@ -1773,7 +1734,7 @@ uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_condensed_country_str. */ -#define SigIeCondensedCountryStr (0x000a) +#define SigIeCondensedCountryStr (0x0009) uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx, @@ -1796,7 +1757,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, @@ -1819,7 +1780,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, @@ -1844,7 +1805,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, @@ -1867,7 +1828,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, @@ -1877,64 +1838,64 @@ uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp13__; uint8_t tmp14__; uint8_t tmp15__; uint8_t tmp16__; uint8_t tmp17__; - uint8_t tmp18__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; + tmp13__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->LinkMeasurement = tmp13__ >> 0 & 0x1; + pDst->NeighborRpt = tmp13__ >> 1 & 0x1; + pDst->parallel = tmp13__ >> 2 & 0x1; + pDst->repeated = tmp13__ >> 3 & 0x1; + pDst->BeaconPassive = tmp13__ >> 4 & 0x1; + pDst->BeaconActive = tmp13__ >> 5 & 0x1; + pDst->BeaconTable = tmp13__ >> 6 & 0x1; + pDst->BeaconRepCond = tmp13__ >> 7 & 0x1; tmp14__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->LinkMeasurement = tmp14__ >> 0 & 0x1; - pDst->NeighborRpt = tmp14__ >> 1 & 0x1; - pDst->parallel = tmp14__ >> 2 & 0x1; - pDst->repeated = tmp14__ >> 3 & 0x1; - pDst->BeaconPassive = tmp14__ >> 4 & 0x1; - pDst->BeaconActive = tmp14__ >> 5 & 0x1; - pDst->BeaconTable = tmp14__ >> 6 & 0x1; - pDst->BeaconRepCond = tmp14__ >> 7 & 0x1; + pDst->FrameMeasurement = tmp14__ >> 0 & 0x1; + pDst->ChannelLoad = tmp14__ >> 1 & 0x1; + pDst->NoiseHistogram = tmp14__ >> 2 & 0x1; + pDst->statistics = tmp14__ >> 3 & 0x1; + pDst->LCIMeasurement = tmp14__ >> 4 & 0x1; + pDst->LCIAzimuth = tmp14__ >> 5 & 0x1; + pDst->TCMCapability = tmp14__ >> 6 & 0x1; + pDst->triggeredTCM = tmp14__ >> 7 & 0x1; tmp15__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->FrameMeasurement = tmp15__ >> 0 & 0x1; - pDst->ChannelLoad = tmp15__ >> 1 & 0x1; - pDst->NoiseHistogram = tmp15__ >> 2 & 0x1; - pDst->statistics = tmp15__ >> 3 & 0x1; - pDst->LCIMeasurement = tmp15__ >> 4 & 0x1; - pDst->LCIAzimuth = tmp15__ >> 5 & 0x1; - pDst->TCMCapability = tmp15__ >> 6 & 0x1; - pDst->triggeredTCM = tmp15__ >> 7 & 0x1; + pDst->APChanReport = tmp15__ >> 0 & 0x1; + pDst->RRMMIBEnabled = tmp15__ >> 1 & 0x1; + pDst->operatingChanMax = tmp15__ >> 2 & 0x7; + pDst->nonOperatinChanMax = tmp15__ >> 5 & 0x7; tmp16__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->APChanReport = tmp16__ >> 0 & 0x1; - pDst->RRMMIBEnabled = tmp16__ >> 1 & 0x1; - pDst->operatingChanMax = tmp16__ >> 2 & 0x7; - pDst->nonOperatinChanMax = tmp16__ >> 5 & 0x7; + pDst->MeasurementPilot = tmp16__ >> 0 & 0x7; + pDst->MeasurementPilotEnabled = tmp16__ >> 3 & 0x1; + pDst->NeighborTSFOffset = tmp16__ >> 4 & 0x1; + pDst->RCPIMeasurement = tmp16__ >> 5 & 0x1; + pDst->RSNIMeasurement = tmp16__ >> 6 & 0x1; + pDst->BssAvgAccessDelay = tmp16__ >> 7 & 0x1; tmp17__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->MeasurementPilot = tmp17__ >> 0 & 0x7; - pDst->MeasurementPilotEnabled = tmp17__ >> 3 & 0x1; - pDst->NeighborTSFOffset = tmp17__ >> 4 & 0x1; - pDst->RCPIMeasurement = tmp17__ >> 5 & 0x1; - pDst->RSNIMeasurement = tmp17__ >> 6 & 0x1; - pDst->BssAvgAccessDelay = tmp17__ >> 7 & 0x1; - tmp18__ = *pBuf; - pDst->BSSAvailAdmission = tmp18__ >> 0 & 0x1; - pDst->AntennaInformation = tmp18__ >> 1 & 0x1; - pDst->fine_time_meas_rpt = tmp18__ >> 2 & 0x1; - pDst->lci_capability = tmp18__ >> 3 & 0x1; - pDst->reserved = tmp18__ >> 4 & 0xf; + pDst->BSSAvailAdmission = tmp17__ >> 0 & 0x1; + pDst->AntennaInformation = tmp17__ >> 1 & 0x1; + pDst->fine_time_meas_rpt = tmp17__ >> 2 & 0x1; + pDst->lci_capability = tmp17__ >> 3 & 0x1; + pDst->reserved = tmp17__ >> 4 & 0xf; (void)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, @@ -1954,7 +1915,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, @@ -1981,7 +1942,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, @@ -1991,18 +1952,18 @@ uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp19__; + uint16_t tmp18__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp19__, pBuf, 0); + framesntohs(pCtx, &tmp18__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->aggregation = tmp19__ >> 0 & 0x1; - pDst->tsid = tmp19__ >> 1 & 0xf; - pDst->direction = tmp19__ >> 5 & 0x3; - pDst->reserved = tmp19__ >> 7 & 0x1ff; + pDst->aggregation = tmp18__ >> 0 & 0x1; + pDst->tsid = tmp18__ >> 1 & 0xf; + pDst->direction = tmp18__ >> 5 & 0x3; + pDst->reserved = tmp18__ >> 7 & 0x1ff; framesntohl(pCtx, &pDst->service_start_time, pBuf, 0); pBuf += 4; ielen -= (uint8_t)4; @@ -2017,7 +1978,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, @@ -2109,10 +2070,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, @@ -2131,7 +2092,7 @@ 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, @@ -2153,7 +2114,7 @@ uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tsf_info. */ -#define SigIeTSFInfo (0x0016) +#define SigIeTSFInfo (0x0015) uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx, @@ -2163,34 +2124,34 @@ uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp20__; - uint8_t tmp21__; - uint16_t tmp22__; + uint16_t tmp19__; + uint8_t tmp20__; + uint16_t tmp21__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp20__, pBuf, 0); + framesntohs(pCtx, &tmp19__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->traffic_type = tmp20__ >> 0 & 0x1; - pDst->tsid = tmp20__ >> 1 & 0xf; - pDst->direction = tmp20__ >> 5 & 0x3; - pDst->access_policy = tmp20__ >> 7 & 0x3; - pDst->aggregation = tmp20__ >> 9 & 0x1; - pDst->psb = tmp20__ >> 10 & 0x1; - pDst->user_priority = tmp20__ >> 11 & 0x7; - pDst->tsinfo_ack_pol = tmp20__ >> 14 & 0x3; - tmp21__ = *pBuf; + pDst->traffic_type = tmp19__ >> 0 & 0x1; + pDst->tsid = tmp19__ >> 1 & 0xf; + pDst->direction = tmp19__ >> 5 & 0x3; + pDst->access_policy = tmp19__ >> 7 & 0x3; + pDst->aggregation = tmp19__ >> 9 & 0x1; + pDst->psb = tmp19__ >> 10 & 0x1; + pDst->user_priority = tmp19__ >> 11 & 0x7; + pDst->tsinfo_ack_pol = tmp19__ >> 14 & 0x3; + tmp20__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->schedule = tmp21__ >> 0 & 0x1; - pDst->unused = tmp21__ >> 1 & 0x7f; - framesntohs(pCtx, &tmp22__, pBuf, 0); + pDst->schedule = tmp20__ >> 0 & 0x1; + pDst->unused = tmp20__ >> 1 & 0x7f; + framesntohs(pCtx, &tmp21__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->size = tmp22__ >> 0 & 0x7fff; - pDst->fixed = tmp22__ >> 15 & 0x1; + pDst->size = tmp21__ >> 0 & 0x7fff; + pDst->fixed = tmp21__ >> 15 & 0x1; framesntohs(pCtx, &pDst->max_msdu_size, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -2235,7 +2196,7 @@ uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tspec. */ -#define SigIeTSPEC (0x0017) +#define SigIeTSPEC (0x0016) uint32_t dot11f_unpack_ie_vht_caps(tpAniSirGlobal pCtx, @@ -2245,55 +2206,55 @@ uint32_t dot11f_unpack_ie_vht_caps(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint32_t tmp23__; + uint32_t tmp22__; + uint16_t tmp23__; uint16_t tmp24__; - uint16_t tmp25__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohl(pCtx, &tmp23__, pBuf, 0); + framesntohl(pCtx, &tmp22__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->maxMPDULen = tmp23__ >> 0 & 0x3; - pDst->supportedChannelWidthSet = tmp23__ >> 2 & 0x3; - pDst->ldpcCodingCap = tmp23__ >> 4 & 0x1; - pDst->shortGI80MHz = tmp23__ >> 5 & 0x1; - pDst->shortGI160and80plus80MHz = tmp23__ >> 6 & 0x1; - pDst->txSTBC = tmp23__ >> 7 & 0x1; - pDst->rxSTBC = tmp23__ >> 8 & 0x7; - pDst->suBeamFormerCap = tmp23__ >> 11 & 0x1; - pDst->suBeamformeeCap = tmp23__ >> 12 & 0x1; - pDst->csnofBeamformerAntSup = tmp23__ >> 13 & 0x7; - pDst->numSoundingDim = tmp23__ >> 16 & 0x7; - pDst->muBeamformerCap = tmp23__ >> 19 & 0x1; - pDst->muBeamformeeCap = tmp23__ >> 20 & 0x1; - pDst->vhtTXOPPS = tmp23__ >> 21 & 0x1; - pDst->htcVHTCap = tmp23__ >> 22 & 0x1; - pDst->maxAMPDULenExp = tmp23__ >> 23 & 0x7; - pDst->vhtLinkAdaptCap = tmp23__ >> 26 & 0x3; - pDst->rxAntPattern = tmp23__ >> 28 & 0x1; - pDst->txAntPattern = tmp23__ >> 29 & 0x1; - pDst->reserved1 = tmp23__ >> 30 & 0x3; + pDst->maxMPDULen = tmp22__ >> 0 & 0x3; + pDst->supportedChannelWidthSet = tmp22__ >> 2 & 0x3; + pDst->ldpcCodingCap = tmp22__ >> 4 & 0x1; + pDst->shortGI80MHz = tmp22__ >> 5 & 0x1; + pDst->shortGI160and80plus80MHz = tmp22__ >> 6 & 0x1; + pDst->txSTBC = tmp22__ >> 7 & 0x1; + pDst->rxSTBC = tmp22__ >> 8 & 0x7; + pDst->suBeamFormerCap = tmp22__ >> 11 & 0x1; + pDst->suBeamformeeCap = tmp22__ >> 12 & 0x1; + pDst->csnofBeamformerAntSup = tmp22__ >> 13 & 0x7; + pDst->numSoundingDim = tmp22__ >> 16 & 0x7; + pDst->muBeamformerCap = tmp22__ >> 19 & 0x1; + pDst->muBeamformeeCap = tmp22__ >> 20 & 0x1; + pDst->vhtTXOPPS = tmp22__ >> 21 & 0x1; + pDst->htcVHTCap = tmp22__ >> 22 & 0x1; + pDst->maxAMPDULenExp = tmp22__ >> 23 & 0x7; + pDst->vhtLinkAdaptCap = tmp22__ >> 26 & 0x3; + pDst->rxAntPattern = tmp22__ >> 28 & 0x1; + pDst->txAntPattern = tmp22__ >> 29 & 0x1; + pDst->reserved1 = tmp22__ >> 30 & 0x3; framesntohs(pCtx, &pDst->rxMCSMap, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - framesntohs(pCtx, &tmp24__, pBuf, 0); + framesntohs(pCtx, &tmp23__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->rxHighSupDataRate = tmp24__ >> 0 & 0x1fff; - pDst->reserved2 = tmp24__ >> 13 & 0x7; + pDst->rxHighSupDataRate = tmp23__ >> 0 & 0x1fff; + pDst->reserved2 = tmp23__ >> 13 & 0x7; framesntohs(pCtx, &pDst->txMCSMap, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - framesntohs(pCtx, &tmp25__, pBuf, 0); - pDst->txSupDataRate = tmp25__ >> 0 & 0x1fff; - pDst->reserved3 = tmp25__ >> 13 & 0x7; + framesntohs(pCtx, &tmp24__, pBuf, 0); + pDst->txSupDataRate = tmp24__ >> 0 & 0x1fff; + pDst->reserved3 = tmp24__ >> 13 & 0x7; (void)pCtx; return status; } /* End dot11f_unpack_ie_vht_caps. */ -#define SigIeVHTCaps (0x0018) +#define SigIeVHTCaps (0x0017) uint32_t dot11f_unpack_ie_vht_operation(tpAniSirGlobal pCtx, @@ -2321,7 +2282,7 @@ uint32_t dot11f_unpack_ie_vht_operation(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vht_operation. */ -#define SigIeVHTOperation (0x0019) +#define SigIeVHTOperation (0x0018) uint32_t dot11f_unpack_ie_wmm_schedule(tpAniSirGlobal pCtx, @@ -2331,7 +2292,7 @@ uint32_t dot11f_unpack_ie_wmm_schedule(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp26__; + uint16_t tmp25__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -2343,13 +2304,13 @@ uint32_t dot11f_unpack_ie_wmm_schedule(tpAniSirGlobal pCtx, pDst->present = 0; return status | DOT11F_BAD_FIXED_VALUE; } - framesntohs(pCtx, &tmp26__, pBuf, 0); + framesntohs(pCtx, &tmp25__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->aggregation = tmp26__ >> 0 & 0x1; - pDst->tsid = tmp26__ >> 1 & 0xf; - pDst->direction = tmp26__ >> 5 & 0x3; - pDst->reserved = tmp26__ >> 7 & 0x1ff; + pDst->aggregation = tmp25__ >> 0 & 0x1; + pDst->tsid = tmp25__ >> 1 & 0xf; + pDst->direction = tmp25__ >> 5 & 0x3; + pDst->reserved = tmp25__ >> 7 & 0x1ff; framesntohl(pCtx, &pDst->service_start_time, pBuf, 0); pBuf += 4; ielen -= (uint8_t)4; @@ -2364,7 +2325,7 @@ uint32_t dot11f_unpack_ie_wmm_schedule(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmm_schedule. */ -#define SigIeWMMSchedule (0x001a) +#define SigIeWMMSchedule (0x0019) uint32_t dot11f_unpack_ie_wmmtclas(tpAniSirGlobal pCtx, @@ -2463,7 +2424,7 @@ uint32_t dot11f_unpack_ie_wmmtclas(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmmtclas. */ -#define SigIeWMMTCLAS (0x001b) +#define SigIeWMMTCLAS (0x001a) uint32_t dot11f_unpack_ie_wmmtclasproc(tpAniSirGlobal pCtx, @@ -2489,7 +2450,7 @@ uint32_t dot11f_unpack_ie_wmmtclasproc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmmtclasproc. */ -#define SigIeWMMTCLASPROC (0x001c) +#define SigIeWMMTCLASPROC (0x001b) uint32_t dot11f_unpack_ie_wmmts_delay(tpAniSirGlobal pCtx, @@ -2515,7 +2476,7 @@ uint32_t dot11f_unpack_ie_wmmts_delay(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmmts_delay. */ -#define SigIeWMMTSDelay (0x001d) +#define SigIeWMMTSDelay (0x001c) uint32_t dot11f_unpack_ie_wmmtspec(tpAniSirGlobal pCtx, @@ -2525,9 +2486,9 @@ uint32_t dot11f_unpack_ie_wmmtspec(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp27__; - uint8_t tmp28__; - uint16_t tmp29__; + uint16_t tmp26__; + uint8_t tmp27__; + uint16_t tmp28__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -2539,27 +2500,27 @@ uint32_t dot11f_unpack_ie_wmmtspec(tpAniSirGlobal pCtx, pDst->present = 0; return status | DOT11F_BAD_FIXED_VALUE; } - framesntohs(pCtx, &tmp27__, pBuf, 0); + framesntohs(pCtx, &tmp26__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->traffic_type = tmp27__ >> 0 & 0x1; - pDst->tsid = tmp27__ >> 1 & 0xf; - pDst->direction = tmp27__ >> 5 & 0x3; - pDst->access_policy = tmp27__ >> 7 & 0x3; - pDst->aggregation = tmp27__ >> 9 & 0x1; - pDst->psb = tmp27__ >> 10 & 0x1; - pDst->user_priority = tmp27__ >> 11 & 0x7; - pDst->tsinfo_ack_pol = tmp27__ >> 14 & 0x3; - tmp28__ = *pBuf; + pDst->traffic_type = tmp26__ >> 0 & 0x1; + pDst->tsid = tmp26__ >> 1 & 0xf; + pDst->direction = tmp26__ >> 5 & 0x3; + pDst->access_policy = tmp26__ >> 7 & 0x3; + pDst->aggregation = tmp26__ >> 9 & 0x1; + pDst->psb = tmp26__ >> 10 & 0x1; + pDst->user_priority = tmp26__ >> 11 & 0x7; + pDst->tsinfo_ack_pol = tmp26__ >> 14 & 0x3; + tmp27__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->tsinfo_rsvd = tmp28__ >> 0 & 0x7f; - pDst->burst_size_defn = tmp28__ >> 7 & 0x1; - framesntohs(pCtx, &tmp29__, pBuf, 0); + pDst->tsinfo_rsvd = tmp27__ >> 0 & 0x7f; + pDst->burst_size_defn = tmp27__ >> 7 & 0x1; + framesntohs(pCtx, &tmp28__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->size = tmp29__ >> 0 & 0x7fff; - pDst->fixed = tmp29__ >> 15 & 0x1; + pDst->size = tmp28__ >> 0 & 0x7fff; + pDst->fixed = tmp28__ >> 15 & 0x1; framesntohs(pCtx, &pDst->max_msdu_size, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -2604,7 +2565,7 @@ uint32_t dot11f_unpack_ie_wmmtspec(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wmmtspec. */ -#define SigIeWMMTSPEC (0x001e) +#define SigIeWMMTSPEC (0x001d) uint32_t dot11f_unpack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx, @@ -2629,7 +2590,7 @@ uint32_t dot11f_unpack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wider_bw_chan_switch_ann. */ -#define SigIeWiderBWChanSwitchAnn (0x001f) +#define SigIeWiderBWChanSwitchAnn (0x001e) uint32_t dot11f_unpack_ie_azimuth_req(tpAniSirGlobal pCtx, @@ -2648,7 +2609,7 @@ uint32_t dot11f_unpack_ie_azimuth_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_azimuth_req. */ -#define SigIeazimuth_req (0x0020) +#define SigIeazimuth_req (0x001f) uint32_t dot11f_unpack_ie_max_age(tpAniSirGlobal pCtx, @@ -2667,7 +2628,7 @@ uint32_t dot11f_unpack_ie_max_age(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_max_age. */ -#define SigIemax_age (0x0021) +#define SigIemax_age (0x0020) static const tFFDefn FFS_neighbor_rpt[] = { @@ -2704,8 +2665,8 @@ uint32_t dot11f_unpack_ie_neighbor_rpt(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp29__; uint8_t tmp30__; - uint8_t tmp31__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -2713,23 +2674,23 @@ uint32_t dot11f_unpack_ie_neighbor_rpt(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6); pBuf += 6; ielen -= (uint8_t)6; + tmp29__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->APReachability = tmp29__ >> 0 & 0x3; + pDst->Security = tmp29__ >> 2 & 0x1; + pDst->KeyScope = tmp29__ >> 3 & 0x1; + pDst->SpecMgmtCap = tmp29__ >> 4 & 0x1; + pDst->QosCap = tmp29__ >> 5 & 0x1; + pDst->apsd = tmp29__ >> 6 & 0x1; + pDst->rrm = tmp29__ >> 7 & 0x1; tmp30__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->APReachability = tmp30__ >> 0 & 0x3; - pDst->Security = tmp30__ >> 2 & 0x1; - pDst->KeyScope = tmp30__ >> 3 & 0x1; - pDst->SpecMgmtCap = tmp30__ >> 4 & 0x1; - pDst->QosCap = tmp30__ >> 5 & 0x1; - pDst->apsd = tmp30__ >> 6 & 0x1; - pDst->rrm = tmp30__ >> 7 & 0x1; - tmp31__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->DelayedBA = tmp31__ >> 0 & 0x1; - pDst->ImmBA = tmp31__ >> 1 & 0x1; - pDst->MobilityDomain = tmp31__ >> 2 & 0x1; - pDst->reserved = tmp31__ >> 3 & 0x1f; + pDst->DelayedBA = tmp30__ >> 0 & 0x1; + pDst->ImmBA = tmp30__ >> 1 & 0x1; + pDst->MobilityDomain = tmp30__ >> 2 & 0x1; + pDst->reserved = tmp30__ >> 3 & 0x1f; framesntohs(pCtx, &pDst->reserved1, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -2754,7 +2715,7 @@ uint32_t dot11f_unpack_ie_neighbor_rpt(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_neighbor_rpt. */ -#define SigIeneighbor_rpt (0x0022) +#define SigIeneighbor_rpt (0x0021) uint32_t dot11f_unpack_ie_req_mac_addr(tpAniSirGlobal pCtx, @@ -2773,7 +2734,7 @@ uint32_t dot11f_unpack_ie_req_mac_addr(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_req_mac_addr. */ -#define SigIereq_mac_addr (0x0023) +#define SigIereq_mac_addr (0x0022) uint32_t dot11f_unpack_ie_tgt_mac_addr(tpAniSirGlobal pCtx, @@ -2792,7 +2753,7 @@ uint32_t dot11f_unpack_ie_tgt_mac_addr(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tgt_mac_addr. */ -#define SigIetgt_mac_addr (0x0024) +#define SigIetgt_mac_addr (0x0023) uint32_t dot11f_unpack_ie_vht_transmit_power_env(tpAniSirGlobal pCtx, @@ -2817,7 +2778,7 @@ uint32_t dot11f_unpack_ie_vht_transmit_power_env(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vht_transmit_power_env. */ -#define SigIevht_transmit_power_env (0x0025) +#define SigIevht_transmit_power_env (0x0024) uint32_t dot11f_unpack_ie_aid(tpAniSirGlobal pCtx, @@ -2836,7 +2797,7 @@ uint32_t dot11f_unpack_ie_aid(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_aid. */ -#define SigIeAID (0x0026) +#define SigIeAID (0x0025) uint32_t dot11f_unpack_ie_cf_params(tpAniSirGlobal pCtx, @@ -2864,7 +2825,7 @@ uint32_t dot11f_unpack_ie_cf_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_cf_params. */ -#define SigIeCFParams (0x0027) +#define SigIeCFParams (0x0026) uint32_t dot11f_unpack_ie_challenge_text(tpAniSirGlobal pCtx, @@ -2889,7 +2850,7 @@ uint32_t dot11f_unpack_ie_challenge_text(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_challenge_text. */ -#define SigIeChallengeText (0x0028) +#define SigIeChallengeText (0x0027) uint32_t dot11f_unpack_ie_chan_switch_ann(tpAniSirGlobal pCtx, @@ -2914,7 +2875,7 @@ uint32_t dot11f_unpack_ie_chan_switch_ann(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_chan_switch_ann. */ -#define SigIeChanSwitchAnn (0x0029) +#define SigIeChanSwitchAnn (0x0028) static const tFFDefn FFS_ChannelSwitchWrapper[] = { @@ -2956,7 +2917,7 @@ uint32_t dot11f_unpack_ie_channel_switch_wrapper(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_channel_switch_wrapper. */ -#define SigIeChannelSwitchWrapper (0x002a) +#define SigIeChannelSwitchWrapper (0x0029) uint32_t dot11f_unpack_ie_country(tpAniSirGlobal pCtx, @@ -2989,10 +2950,10 @@ uint32_t dot11f_unpack_ie_country(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_country. */ -#define SigIeCountry (0x002b) +#define SigIeCountry (0x002a) -#define SigIeDSParams (0x002c) +#define SigIeDSParams (0x002b) uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, @@ -3002,6 +2963,7 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp31__; uint8_t tmp32__; uint8_t tmp33__; uint8_t tmp34__; @@ -3009,7 +2971,6 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp36__; uint8_t tmp37__; uint8_t tmp38__; - uint8_t tmp39__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3020,69 +2981,69 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, pDst->reserved = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + tmp31__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acbe_aifsn = tmp31__ >> 0 & 0xf; + pDst->acbe_acm = tmp31__ >> 4 & 0x1; + pDst->acbe_aci = tmp31__ >> 5 & 0x3; + pDst->unused1 = tmp31__ >> 7 & 0x1; tmp32__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp32__ >> 0 & 0xf; - pDst->acbe_acm = tmp32__ >> 4 & 0x1; - pDst->acbe_aci = tmp32__ >> 5 & 0x3; - pDst->unused1 = tmp32__ >> 7 & 0x1; - tmp33__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_acwmin = tmp33__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp33__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp32__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp32__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; + tmp33__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acbk_aifsn = tmp33__ >> 0 & 0xf; + pDst->acbk_acm = tmp33__ >> 4 & 0x1; + pDst->acbk_aci = tmp33__ >> 5 & 0x3; + pDst->unused2 = tmp33__ >> 7 & 0x1; tmp34__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp34__ >> 0 & 0xf; - pDst->acbk_acm = tmp34__ >> 4 & 0x1; - pDst->acbk_aci = tmp34__ >> 5 & 0x3; - pDst->unused2 = tmp34__ >> 7 & 0x1; - tmp35__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbk_acwmin = tmp35__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp35__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp34__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp34__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; + tmp35__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvi_aifsn = tmp35__ >> 0 & 0xf; + pDst->acvi_acm = tmp35__ >> 4 & 0x1; + pDst->acvi_aci = tmp35__ >> 5 & 0x3; + pDst->unused3 = tmp35__ >> 7 & 0x1; tmp36__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp36__ >> 0 & 0xf; - pDst->acvi_acm = tmp36__ >> 4 & 0x1; - pDst->acvi_aci = tmp36__ >> 5 & 0x3; - pDst->unused3 = tmp36__ >> 7 & 0x1; - tmp37__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvi_acwmin = tmp37__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp37__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp36__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp36__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; + tmp37__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_aifsn = tmp37__ >> 0 & 0xf; + pDst->acvo_acm = tmp37__ >> 4 & 0x1; + pDst->acvo_aci = tmp37__ >> 5 & 0x3; + pDst->unused4 = tmp37__ >> 7 & 0x1; tmp38__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp38__ >> 0 & 0xf; - pDst->acvo_acm = tmp38__ >> 4 & 0x1; - pDst->acvo_aci = tmp38__ >> 5 & 0x3; - pDst->unused4 = tmp38__ >> 7 & 0x1; - tmp39__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvo_acwmin = tmp39__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp39__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp38__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp38__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11f_unpack_ie_edca_param_set. */ -#define SigIeEDCAParamSet (0x002d) +#define SigIeEDCAParamSet (0x002c) uint32_t dot11f_unpack_ie_erp_info(tpAniSirGlobal pCtx, @@ -3092,21 +3053,21 @@ uint32_t dot11f_unpack_ie_erp_info(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp40__; + uint8_t tmp39__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp40__ = *pBuf; - pDst->non_erp_present = tmp40__ >> 0 & 0x1; - pDst->use_prot = tmp40__ >> 1 & 0x1; - pDst->barker_preamble = tmp40__ >> 2 & 0x1; - pDst->unused = tmp40__ >> 3 & 0x1f; + tmp39__ = *pBuf; + pDst->non_erp_present = tmp39__ >> 0 & 0x1; + pDst->use_prot = tmp39__ >> 1 & 0x1; + pDst->barker_preamble = tmp39__ >> 2 & 0x1; + pDst->unused = tmp39__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11f_unpack_ie_erp_info. */ -#define SigIeERPInfo (0x002e) +#define SigIeERPInfo (0x002d) uint32_t dot11f_unpack_ie_ese_cckm_opaque(tpAniSirGlobal pCtx, @@ -3131,7 +3092,7 @@ uint32_t dot11f_unpack_ie_ese_cckm_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_cckm_opaque. */ -#define SigIeESECckmOpaque (0x002f) +#define SigIeESECckmOpaque (0x002e) uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, @@ -3141,7 +3102,7 @@ uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp41__; + uint8_t tmp40__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3149,14 +3110,14 @@ uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, pDst->mgmt_state = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp41__ = *pBuf; - pDst->mbssid_mask = tmp41__ >> 0 & 0x7; - pDst->reserved = tmp41__ >> 3 & 0x1f; + tmp40__ = *pBuf; + pDst->mbssid_mask = tmp40__ >> 0 & 0x7; + pDst->reserved = tmp40__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11f_unpack_ie_ese_rad_mgmt_cap. */ -#define SigIeESERadMgmtCap (0x0030) +#define SigIeESERadMgmtCap (0x002f) uint32_t dot11f_unpack_ie_ese_traf_strm_met(tpAniSirGlobal pCtx, @@ -3181,7 +3142,7 @@ uint32_t dot11f_unpack_ie_ese_traf_strm_met(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_traf_strm_met. */ -#define SigIeESETrafStrmMet (0x0031) +#define SigIeESETrafStrmMet (0x0030) uint32_t dot11f_unpack_ie_ese_traf_strm_rate_set(tpAniSirGlobal pCtx, @@ -3209,7 +3170,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 (0x0032) +#define SigIeESETrafStrmRateSet (0x0031) uint32_t dot11f_unpack_ie_ese_txmit_power(tpAniSirGlobal pCtx, @@ -3231,7 +3192,7 @@ uint32_t dot11f_unpack_ie_ese_txmit_power(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_txmit_power. */ -#define SigIeESETxmitPower (0x0033) +#define SigIeESETxmitPower (0x0032) uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx, @@ -3250,7 +3211,7 @@ uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_version. */ -#define SigIeESEVersion (0x0034) +#define SigIeESEVersion (0x0033) uint32_t dot11f_unpack_ie_ext_cap(tpAniSirGlobal pCtx, @@ -3280,7 +3241,7 @@ endUnpackIeExtCap: return status; } /* End dot11f_unpack_ie_ext_cap. */ -#define SigIeExtCap (0x0035) +#define SigIeExtCap (0x0034) uint32_t dot11f_unpack_ie_ext_supp_rates(tpAniSirGlobal pCtx, @@ -3313,7 +3274,7 @@ uint32_t dot11f_unpack_ie_ext_supp_rates(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ext_supp_rates. */ -#define SigIeExtSuppRates (0x0036) +#define SigIeExtSuppRates (0x0035) uint32_t dot11f_unpack_ie_fh_param_set(tpAniSirGlobal pCtx, @@ -3341,7 +3302,7 @@ uint32_t dot11f_unpack_ie_fh_param_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_param_set. */ -#define SigIeFHParamSet (0x0037) +#define SigIeFHParamSet (0x0036) uint32_t dot11f_unpack_ie_fh_params(tpAniSirGlobal pCtx, @@ -3363,7 +3324,7 @@ uint32_t dot11f_unpack_ie_fh_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_params. */ -#define SigIeFHParams (0x0038) +#define SigIeFHParams (0x0037) uint32_t dot11f_unpack_ie_fh_patt_table(tpAniSirGlobal pCtx, @@ -3400,7 +3361,7 @@ uint32_t dot11f_unpack_ie_fh_patt_table(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_patt_table. */ -#define SigIeFHPattTable (0x0039) +#define SigIeFHPattTable (0x0038) static const tFFDefn FFS_FTInfo[] = { @@ -3429,16 +3390,16 @@ uint32_t dot11f_unpack_ie_ft_info(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp42__; + uint16_t tmp41__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp42__, pBuf, 0); + framesntohs(pCtx, &tmp41__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->reserved = tmp42__ >> 0 & 0xff; - pDst->IECount = tmp42__ >> 8 & 0xff; + pDst->reserved = tmp41__ >> 0 & 0xff; + pDst->IECount = tmp41__ >> 8 & 0xff; DOT11F_MEMCPY(pCtx, pDst->MIC, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; @@ -3460,7 +3421,7 @@ uint32_t dot11f_unpack_ie_ft_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ft_info. */ -#define SigIeFTInfo (0x003a) +#define SigIeFTInfo (0x0039) uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, @@ -3470,79 +3431,79 @@ uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp43__; - uint8_t tmp44__; - uint16_t tmp45__; - uint32_t tmp46__; - uint8_t tmp47__; + uint16_t tmp42__; + uint8_t tmp43__; + uint16_t tmp44__; + uint32_t tmp45__; + uint8_t tmp46__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp43__, pBuf, 0); + framesntohs(pCtx, &tmp42__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->advCodingCap = tmp43__ >> 0 & 0x1; - pDst->supportedChannelWidthSet = tmp43__ >> 1 & 0x1; - pDst->mimoPowerSave = tmp43__ >> 2 & 0x3; - pDst->greenField = tmp43__ >> 4 & 0x1; - pDst->shortGI20MHz = tmp43__ >> 5 & 0x1; - pDst->shortGI40MHz = tmp43__ >> 6 & 0x1; - pDst->txSTBC = tmp43__ >> 7 & 0x1; - pDst->rxSTBC = tmp43__ >> 8 & 0x3; - pDst->delayedBA = tmp43__ >> 10 & 0x1; - pDst->maximalAMSDUsize = tmp43__ >> 11 & 0x1; - pDst->dsssCckMode40MHz = tmp43__ >> 12 & 0x1; - pDst->psmp = tmp43__ >> 13 & 0x1; - pDst->stbcControlFrame = tmp43__ >> 14 & 0x1; - pDst->lsigTXOPProtection = tmp43__ >> 15 & 0x1; - tmp44__ = *pBuf; + pDst->advCodingCap = tmp42__ >> 0 & 0x1; + pDst->supportedChannelWidthSet = tmp42__ >> 1 & 0x1; + pDst->mimoPowerSave = tmp42__ >> 2 & 0x3; + pDst->greenField = tmp42__ >> 4 & 0x1; + pDst->shortGI20MHz = tmp42__ >> 5 & 0x1; + pDst->shortGI40MHz = tmp42__ >> 6 & 0x1; + pDst->txSTBC = tmp42__ >> 7 & 0x1; + pDst->rxSTBC = tmp42__ >> 8 & 0x3; + pDst->delayedBA = tmp42__ >> 10 & 0x1; + pDst->maximalAMSDUsize = tmp42__ >> 11 & 0x1; + pDst->dsssCckMode40MHz = tmp42__ >> 12 & 0x1; + pDst->psmp = tmp42__ >> 13 & 0x1; + pDst->stbcControlFrame = tmp42__ >> 14 & 0x1; + pDst->lsigTXOPProtection = tmp42__ >> 15 & 0x1; + tmp43__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->maxRxAMPDUFactor = tmp44__ >> 0 & 0x3; - pDst->mpduDensity = tmp44__ >> 2 & 0x7; - pDst->reserved1 = tmp44__ >> 5 & 0x7; + pDst->maxRxAMPDUFactor = tmp43__ >> 0 & 0x3; + pDst->mpduDensity = tmp43__ >> 2 & 0x7; + pDst->reserved1 = tmp43__ >> 5 & 0x7; DOT11F_MEMCPY(pCtx, pDst->supportedMCSSet, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; - framesntohs(pCtx, &tmp45__, pBuf, 0); + framesntohs(pCtx, &tmp44__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->pco = tmp45__ >> 0 & 0x1; - pDst->transitionTime = tmp45__ >> 1 & 0x3; - pDst->reserved2 = tmp45__ >> 3 & 0x1f; - pDst->mcsFeedback = tmp45__ >> 8 & 0x3; - pDst->reserved3 = tmp45__ >> 10 & 0x3f; - framesntohl(pCtx, &tmp46__, pBuf, 0); + pDst->pco = tmp44__ >> 0 & 0x1; + pDst->transitionTime = tmp44__ >> 1 & 0x3; + pDst->reserved2 = tmp44__ >> 3 & 0x1f; + pDst->mcsFeedback = tmp44__ >> 8 & 0x3; + pDst->reserved3 = tmp44__ >> 10 & 0x3f; + framesntohl(pCtx, &tmp45__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->txBF = tmp46__ >> 0 & 0x1; - pDst->rxStaggeredSounding = tmp46__ >> 1 & 0x1; - pDst->txStaggeredSounding = tmp46__ >> 2 & 0x1; - pDst->rxZLF = tmp46__ >> 3 & 0x1; - pDst->txZLF = tmp46__ >> 4 & 0x1; - pDst->implicitTxBF = tmp46__ >> 5 & 0x1; - pDst->calibration = tmp46__ >> 6 & 0x3; - pDst->explicitCSITxBF = tmp46__ >> 8 & 0x1; - pDst->explicitUncompressedSteeringMatrix = tmp46__ >> 9 & 0x1; - pDst->explicitBFCSIFeedback = tmp46__ >> 10 & 0x7; - pDst->explicitUncompressedSteeringMatrixFeedback = tmp46__ >> 13 & 0x7; - pDst->explicitCompressedSteeringMatrixFeedback = tmp46__ >> 16 & 0x7; - pDst->csiNumBFAntennae = tmp46__ >> 19 & 0x3; - pDst->uncompressedSteeringMatrixBFAntennae = tmp46__ >> 21 & 0x3; - pDst->compressedSteeringMatrixBFAntennae = tmp46__ >> 23 & 0x3; - pDst->reserved4 = tmp46__ >> 25 & 0x7f; - tmp47__ = *pBuf; + pDst->txBF = tmp45__ >> 0 & 0x1; + pDst->rxStaggeredSounding = tmp45__ >> 1 & 0x1; + pDst->txStaggeredSounding = tmp45__ >> 2 & 0x1; + pDst->rxZLF = tmp45__ >> 3 & 0x1; + pDst->txZLF = tmp45__ >> 4 & 0x1; + pDst->implicitTxBF = tmp45__ >> 5 & 0x1; + pDst->calibration = tmp45__ >> 6 & 0x3; + pDst->explicitCSITxBF = tmp45__ >> 8 & 0x1; + pDst->explicitUncompressedSteeringMatrix = tmp45__ >> 9 & 0x1; + pDst->explicitBFCSIFeedback = tmp45__ >> 10 & 0x7; + pDst->explicitUncompressedSteeringMatrixFeedback = tmp45__ >> 13 & 0x7; + pDst->explicitCompressedSteeringMatrixFeedback = tmp45__ >> 16 & 0x7; + pDst->csiNumBFAntennae = tmp45__ >> 19 & 0x3; + pDst->uncompressedSteeringMatrixBFAntennae = tmp45__ >> 21 & 0x3; + pDst->compressedSteeringMatrixBFAntennae = tmp45__ >> 23 & 0x3; + pDst->reserved4 = tmp45__ >> 25 & 0x7f; + tmp46__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->antennaSelection = tmp47__ >> 0 & 0x1; - pDst->explicitCSIFeedbackTx = tmp47__ >> 1 & 0x1; - pDst->antennaIndicesFeedbackTx = tmp47__ >> 2 & 0x1; - pDst->explicitCSIFeedback = tmp47__ >> 3 & 0x1; - pDst->antennaIndicesFeedback = tmp47__ >> 4 & 0x1; - pDst->rxAS = tmp47__ >> 5 & 0x1; - pDst->txSoundingPPDUs = tmp47__ >> 6 & 0x1; - pDst->reserved5 = tmp47__ >> 7 & 0x1; + pDst->antennaSelection = tmp46__ >> 0 & 0x1; + pDst->explicitCSIFeedbackTx = tmp46__ >> 1 & 0x1; + pDst->antennaIndicesFeedbackTx = tmp46__ >> 2 & 0x1; + pDst->explicitCSIFeedback = tmp46__ >> 3 & 0x1; + pDst->antennaIndicesFeedback = tmp46__ >> 4 & 0x1; + pDst->rxAS = tmp46__ >> 5 & 0x1; + pDst->txSoundingPPDUs = tmp46__ >> 6 & 0x1; + pDst->reserved5 = tmp46__ >> 7 & 0x1; pDst->num_rsvd = (uint8_t)(ielen); if (ielen > 32) { pDst->present = 0; @@ -3554,7 +3515,7 @@ uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht_caps. */ -#define SigIeHTCaps (0x003b) +#define SigIeHTCaps (0x003a) uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, @@ -3564,9 +3525,9 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp48__; + uint8_t tmp47__; + uint16_t tmp48__; uint16_t tmp49__; - uint16_t tmp50__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3574,32 +3535,32 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, pDst->primaryChannel = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp48__ = *pBuf; + tmp47__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->secondaryChannelOffset = tmp48__ >> 0 & 0x3; - pDst->recommendedTxWidthSet = tmp48__ >> 2 & 0x1; - pDst->rifsMode = tmp48__ >> 3 & 0x1; - pDst->controlledAccessOnly = tmp48__ >> 4 & 0x1; - pDst->serviceIntervalGranularity = tmp48__ >> 5 & 0x7; + pDst->secondaryChannelOffset = tmp47__ >> 0 & 0x3; + pDst->recommendedTxWidthSet = tmp47__ >> 2 & 0x1; + pDst->rifsMode = tmp47__ >> 3 & 0x1; + pDst->controlledAccessOnly = tmp47__ >> 4 & 0x1; + pDst->serviceIntervalGranularity = tmp47__ >> 5 & 0x7; + framesntohs(pCtx, &tmp48__, pBuf, 0); + pBuf += 2; + ielen -= 2; + pDst->opMode = tmp48__ >> 0 & 0x3; + pDst->nonGFDevicesPresent = tmp48__ >> 2 & 0x1; + pDst->transmitBurstLimit = tmp48__ >> 3 & 0x1; + pDst->obssNonHTStaPresent = tmp48__ >> 4 & 0x1; + pDst->reserved = tmp48__ >> 5 & 0x7ff; framesntohs(pCtx, &tmp49__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->opMode = tmp49__ >> 0 & 0x3; - pDst->nonGFDevicesPresent = tmp49__ >> 2 & 0x1; - pDst->transmitBurstLimit = tmp49__ >> 3 & 0x1; - pDst->obssNonHTStaPresent = tmp49__ >> 4 & 0x1; - pDst->reserved = tmp49__ >> 5 & 0x7ff; - framesntohs(pCtx, &tmp50__, pBuf, 0); - pBuf += 2; - ielen -= 2; - pDst->basicSTBCMCS = tmp50__ >> 0 & 0x7f; - pDst->dualCTSProtection = tmp50__ >> 7 & 0x1; - pDst->secondaryBeacon = tmp50__ >> 8 & 0x1; - pDst->lsigTXOPProtectionFullSupport = tmp50__ >> 9 & 0x1; - pDst->pcoActive = tmp50__ >> 10 & 0x1; - pDst->pcoPhase = tmp50__ >> 11 & 0x1; - pDst->reserved2 = tmp50__ >> 12 & 0xf; + pDst->basicSTBCMCS = tmp49__ >> 0 & 0x7f; + pDst->dualCTSProtection = tmp49__ >> 7 & 0x1; + pDst->secondaryBeacon = tmp49__ >> 8 & 0x1; + pDst->lsigTXOPProtectionFullSupport = tmp49__ >> 9 & 0x1; + pDst->pcoActive = tmp49__ >> 10 & 0x1; + pDst->pcoPhase = tmp49__ >> 11 & 0x1; + pDst->reserved2 = tmp49__ >> 12 & 0xf; DOT11F_MEMCPY(pCtx, pDst->basicMCSSet, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; @@ -3614,7 +3575,7 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht_info. */ -#define SigIeHTInfo (0x003c) +#define SigIeHTInfo (0x003b) uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx, @@ -3633,7 +3594,7 @@ uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ibss_params. */ -#define SigIeIBSSParams (0x003d) +#define SigIeIBSSParams (0x003c) uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, @@ -3658,7 +3619,7 @@ uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_link_identifier. */ -#define SigIeLinkIdentifier (0x003e) +#define SigIeLinkIdentifier (0x003d) static const tTLVDefn TLVS_MBO_IE[] = { @@ -3721,7 +3682,7 @@ uint32_t dot11f_unpack_ie_MBO_IE(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_MBO_IE. */ -#define SigIeMBO_IE (0x003f) +#define SigIeMBO_IE (0x003e) static const tFFDefn FFS_reportBeacon[] = { @@ -3744,9 +3705,9 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp50__; uint8_t tmp51__; uint8_t tmp52__; - uint8_t tmp53__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3754,13 +3715,13 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, pDst->token = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp51__ = *pBuf; + tmp50__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->late = tmp51__ >> 0 & 0x1; - pDst->incapable = tmp51__ >> 1 & 0x1; - pDst->refused = tmp51__ >> 2 & 0x1; - pDst->unused = tmp51__ >> 3 & 0x1f; + pDst->late = tmp50__ >> 0 & 0x1; + pDst->incapable = tmp50__ >> 1 & 0x1; + pDst->refused = tmp50__ >> 2 & 0x1; + pDst->unused = tmp50__ >> 3 & 0x1f; pDst->type = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3778,15 +3739,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; - tmp52__ = *pBuf; + tmp51__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Basic.bss = tmp52__ >> 0 & 0x1; - pDst->report.Basic.ofdm_preamble = tmp52__ >> 1 & 0x1; - pDst->report.Basic.unid_signal = tmp52__ >> 2 & 0x1; - pDst->report.Basic.rader = tmp52__ >> 3 & 0x1; - pDst->report.Basic.unmeasured = tmp52__ >> 4 & 0x1; - pDst->report.Basic.unused = tmp52__ >> 5 & 0x7; + pDst->report.Basic.bss = tmp51__ >> 0 & 0x1; + pDst->report.Basic.ofdm_preamble = tmp51__ >> 1 & 0x1; + pDst->report.Basic.unid_signal = tmp51__ >> 2 & 0x1; + pDst->report.Basic.rader = tmp51__ >> 3 & 0x1; + pDst->report.Basic.unmeasured = tmp51__ >> 4 & 0x1; + pDst->report.Basic.unused = tmp51__ >> 5 & 0x7; break; case 1: pDst->report.CCA.channel = *pBuf; @@ -3850,11 +3811,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; - tmp53__ = *pBuf; + tmp52__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Beacon.condensed_PHY = tmp53__ >> 0 & 0x7f; - pDst->report.Beacon.reported_frame_type = tmp53__ >> 7 & 0x1; + pDst->report.Beacon.condensed_PHY = tmp52__ >> 0 & 0x7f; + pDst->report.Beacon.reported_frame_type = tmp52__ >> 7 & 0x1; pDst->report.Beacon.RCPI = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3884,7 +3845,7 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_report. */ -#define SigIeMeasurementReport (0x0040) +#define SigIeMeasurementReport (0x003f) static const tFFDefn FFS_measurement_requestBeacon[] = { @@ -3964,7 +3925,7 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp54__; + uint8_t tmp53__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3972,15 +3933,15 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, pDst->measurement_token = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp54__ = *pBuf; + tmp53__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->parallel = tmp54__ >> 0 & 0x1; - pDst->enable = tmp54__ >> 1 & 0x1; - pDst->request = tmp54__ >> 2 & 0x1; - pDst->report = tmp54__ >> 3 & 0x1; - pDst->durationMandatory = tmp54__ >> 4 & 0x1; - pDst->unused = tmp54__ >> 5 & 0x7; + pDst->parallel = tmp53__ >> 0 & 0x1; + pDst->enable = tmp53__ >> 1 & 0x1; + pDst->request = tmp53__ >> 2 & 0x1; + pDst->report = tmp53__ >> 3 & 0x1; + pDst->durationMandatory = tmp53__ >> 4 & 0x1; + pDst->unused = tmp53__ >> 5 & 0x7; pDst->measurement_type = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -4077,7 +4038,7 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_request. */ -#define SigIeMeasurementRequest (0x0041) +#define SigIeMeasurementRequest (0x0040) uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, @@ -4087,7 +4048,7 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp55__; + uint8_t tmp54__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4095,15 +4056,15 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, framesntohs(pCtx, &pDst->MDID, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp55__ = *pBuf; - pDst->overDSCap = tmp55__ >> 0 & 0x1; - pDst->resourceReqCap = tmp55__ >> 1 & 0x1; - pDst->reserved = tmp55__ >> 2 & 0x3f; + tmp54__ = *pBuf; + pDst->overDSCap = tmp54__ >> 0 & 0x1; + pDst->resourceReqCap = tmp54__ >> 1 & 0x1; + pDst->reserved = tmp54__ >> 2 & 0x3f; (void)pCtx; return status; } /* End dot11f_unpack_ie_mobility_domain. */ -#define SigIeMobilityDomain (0x0042) +#define SigIeMobilityDomain (0x0041) static const tFFDefn FFS_NeighborReport[] = { @@ -4140,8 +4101,8 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp55__; uint8_t tmp56__; - uint8_t tmp57__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4149,23 +4110,23 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6); pBuf += 6; ielen -= (uint8_t)6; + tmp55__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->APReachability = tmp55__ >> 0 & 0x3; + pDst->Security = tmp55__ >> 2 & 0x1; + pDst->KeyScope = tmp55__ >> 3 & 0x1; + pDst->SpecMgmtCap = tmp55__ >> 4 & 0x1; + pDst->QosCap = tmp55__ >> 5 & 0x1; + pDst->apsd = tmp55__ >> 6 & 0x1; + pDst->rrm = tmp55__ >> 7 & 0x1; tmp56__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->APReachability = tmp56__ >> 0 & 0x3; - pDst->Security = tmp56__ >> 2 & 0x1; - pDst->KeyScope = tmp56__ >> 3 & 0x1; - pDst->SpecMgmtCap = tmp56__ >> 4 & 0x1; - pDst->QosCap = tmp56__ >> 5 & 0x1; - pDst->apsd = tmp56__ >> 6 & 0x1; - pDst->rrm = tmp56__ >> 7 & 0x1; - tmp57__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->DelayedBA = tmp57__ >> 0 & 0x1; - pDst->ImmBA = tmp57__ >> 1 & 0x1; - pDst->MobilityDomain = tmp57__ >> 2 & 0x1; - pDst->reserved = tmp57__ >> 3 & 0x1f; + pDst->DelayedBA = tmp56__ >> 0 & 0x1; + pDst->ImmBA = tmp56__ >> 1 & 0x1; + pDst->MobilityDomain = tmp56__ >> 2 & 0x1; + pDst->reserved = tmp56__ >> 3 & 0x1f; framesntohs(pCtx, &pDst->reserved1, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -4190,7 +4151,7 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_neighbor_report. */ -#define SigIeNeighborReport (0x0043) +#define SigIeNeighborReport (0x0042) uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, @@ -4227,7 +4188,7 @@ uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_obss_scan_parameters. */ -#define SigIeOBSSScanParameters (0x0044) +#define SigIeOBSSScanParameters (0x0043) uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, @@ -4237,21 +4198,21 @@ uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp58__; + uint8_t tmp57__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp58__ = *pBuf; - pDst->chanWidth = tmp58__ >> 0 & 0x3; - pDst->reserved = tmp58__ >> 2 & 0x3; - pDst->rxNSS = tmp58__ >> 4 & 0x7; - pDst->rxNSSType = tmp58__ >> 7 & 0x1; + tmp57__ = *pBuf; + pDst->chanWidth = tmp57__ >> 0 & 0x3; + pDst->reserved = tmp57__ >> 2 & 0x3; + pDst->rxNSS = tmp57__ >> 4 & 0x7; + pDst->rxNSSType = tmp57__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_operating_mode. */ -#define SigIeOperatingMode (0x0045) +#define SigIeOperatingMode (0x0044) static const tTLVDefn TLVS_P2PAssocReq[] = { @@ -4283,7 +4244,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_req. */ -#define SigIeP2PAssocReq (0x0046) +#define SigIeP2PAssocReq (0x0045) static const tTLVDefn TLVS_P2PAssocRes[] = { @@ -4312,7 +4273,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_res. */ -#define SigIeP2PAssocRes (0x0047) +#define SigIeP2PAssocRes (0x0046) static const tTLVDefn TLVS_P2PBeacon[] = { @@ -4344,7 +4305,7 @@ uint32_t dot11f_unpack_ie_p2_p_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_beacon. */ -#define SigIeP2PBeacon (0x0048) +#define SigIeP2PBeacon (0x0047) static const tTLVDefn TLVS_P2PBeaconProbeRes[] = { @@ -4386,7 +4347,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 (0x0049) +#define SigIeP2PBeaconProbeRes (0x0048) static const tTLVDefn TLVS_P2PDeAuth[] = { @@ -4412,7 +4373,7 @@ uint32_t dot11f_unpack_ie_p2_p_de_auth(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_de_auth. */ -#define SigIeP2PDeAuth (0x004a) +#define SigIeP2PDeAuth (0x0049) static const tTLVDefn TLVS_P2PDisAssoc[] = { @@ -4438,7 +4399,7 @@ uint32_t dot11f_unpack_ie_p2_p_dis_assoc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_dis_assoc. */ -#define SigIeP2PDisAssoc (0x004b) +#define SigIeP2PDisAssoc (0x004a) uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, @@ -4463,7 +4424,7 @@ uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_pie_opaque. */ -#define SigIeP2PIEOpaque (0x004c) +#define SigIeP2PIEOpaque (0x004b) static const tTLVDefn TLVS_P2PProbeReq[] = { @@ -4502,7 +4463,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_req. */ -#define SigIeP2PProbeReq (0x004d) +#define SigIeP2PProbeReq (0x004c) static const tTLVDefn TLVS_P2PProbeRes[] = { @@ -4541,7 +4502,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_res. */ -#define SigIeP2PProbeRes (0x004e) +#define SigIeP2PProbeRes (0x004d) uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, @@ -4563,7 +4524,7 @@ uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_pti_control. */ -#define SigIePTIControl (0x004f) +#define SigIePTIControl (0x004e) uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, @@ -4573,22 +4534,22 @@ uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp59__; + uint8_t tmp58__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp59__ = *pBuf; - pDst->ac_bk_traffic_aval = tmp59__ >> 0 & 0x1; - pDst->ac_be_traffic_aval = tmp59__ >> 1 & 0x1; - pDst->ac_vi_traffic_aval = tmp59__ >> 2 & 0x1; - pDst->ac_vo_traffic_aval = tmp59__ >> 3 & 0x1; - pDst->reserved = tmp59__ >> 4 & 0xf; + tmp58__ = *pBuf; + pDst->ac_bk_traffic_aval = tmp58__ >> 0 & 0x1; + pDst->ac_be_traffic_aval = tmp58__ >> 1 & 0x1; + pDst->ac_vi_traffic_aval = tmp58__ >> 2 & 0x1; + pDst->ac_vo_traffic_aval = tmp58__ >> 3 & 0x1; + pDst->reserved = tmp58__ >> 4 & 0xf; (void)pCtx; return status; } /* End dot11f_unpack_ie_pu_buffer_status. */ -#define SigIePUBufferStatus (0x0050) +#define SigIePUBufferStatus (0x004f) uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, @@ -4610,7 +4571,7 @@ uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_caps. */ -#define SigIePowerCaps (0x0051) +#define SigIePowerCaps (0x0050) uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, @@ -4629,7 +4590,7 @@ uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_constraints. */ -#define SigIePowerConstraints (0x0052) +#define SigIePowerConstraints (0x0051) uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, @@ -4654,7 +4615,7 @@ uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qbss_load. */ -#define SigIeQBSSLoad (0x0053) +#define SigIeQBSSLoad (0x0052) uint32_t dot11f_unpack_ie_QCN_IE(tpAniSirGlobal pCtx, @@ -4673,7 +4634,7 @@ uint32_t dot11f_unpack_ie_QCN_IE(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_QCN_IE. */ -#define SigIeQCN_IE (0x0054) +#define SigIeQCN_IE (0x0053) uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, @@ -4695,7 +4656,7 @@ uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_QComVendorIE. */ -#define SigIeQComVendorIE (0x0055) +#define SigIeQComVendorIE (0x0054) uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, @@ -4705,22 +4666,22 @@ uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp60__; + uint8_t tmp59__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp60__ = *pBuf; - pDst->count = tmp60__ >> 0 & 0xf; - pDst->qack = tmp60__ >> 4 & 0x1; - pDst->qreq = tmp60__ >> 5 & 0x1; - pDst->txopreq = tmp60__ >> 6 & 0x1; - pDst->reserved = tmp60__ >> 7 & 0x1; + tmp59__ = *pBuf; + pDst->count = tmp59__ >> 0 & 0xf; + pDst->qack = tmp59__ >> 4 & 0x1; + pDst->qreq = tmp59__ >> 5 & 0x1; + pDst->txopreq = tmp59__ >> 6 & 0x1; + pDst->reserved = tmp59__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_qos_caps_ap. */ -#define SigIeQOSCapsAp (0x0056) +#define SigIeQOSCapsAp (0x0055) uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, @@ -4730,24 +4691,24 @@ uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp61__; + uint8_t tmp60__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp61__ = *pBuf; - pDst->acvo_uapsd = tmp61__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp61__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp61__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp61__ >> 3 & 0x1; - pDst->qack = tmp61__ >> 4 & 0x1; - pDst->max_sp_length = tmp61__ >> 5 & 0x3; - pDst->more_data_ack = tmp61__ >> 7 & 0x1; + tmp60__ = *pBuf; + pDst->acvo_uapsd = tmp60__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp60__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp60__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp60__ >> 3 & 0x1; + pDst->qack = tmp60__ >> 4 & 0x1; + pDst->max_sp_length = tmp60__ >> 5 & 0x3; + pDst->more_data_ack = tmp60__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_qos_caps_station. */ -#define SigIeQOSCapsStation (0x0057) +#define SigIeQOSCapsStation (0x0056) uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, @@ -4772,7 +4733,7 @@ uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qos_map_set. */ -#define SigIeQosMapSet (0x0058) +#define SigIeQosMapSet (0x0057) uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, @@ -4800,7 +4761,7 @@ uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_quiet. */ -#define SigIeQuiet (0x0059) +#define SigIeQuiet (0x0058) uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, @@ -4819,7 +4780,7 @@ uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rcpiie. */ -#define SigIeRCPIIE (0x005a) +#define SigIeRCPIIE (0x0059) static const tFFDefn FFS_RICDataDesc[] = { @@ -4895,7 +4856,7 @@ uint32_t dot11f_unpack_ie_ric_data_desc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_data_desc. */ -#define SigIeRICDataDesc (0x005b) +#define SigIeRICDataDesc (0x005a) uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, @@ -4994,7 +4955,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn. */ -#define SigIeRSN (0x005c) +#define SigIeRSN (0x005b) uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, @@ -5013,7 +4974,7 @@ uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsniie. */ -#define SigIeRSNIIE (0x005d) +#define SigIeRSNIIE (0x005c) uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, @@ -5038,7 +4999,7 @@ uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn_opaque. */ -#define SigIeRSNOpaque (0x005e) +#define SigIeRSNOpaque (0x005d) uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, @@ -5063,7 +5024,7 @@ uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_channels. */ -#define SigIeSuppChannels (0x005f) +#define SigIeSuppChannels (0x005e) uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, @@ -5088,7 +5049,7 @@ uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_operating_classes. */ -#define SigIeSuppOperatingClasses (0x0060) +#define SigIeSuppOperatingClasses (0x005f) uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, @@ -5121,7 +5082,7 @@ uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_rates. */ -#define SigIeSuppRates (0x0061) +#define SigIeSuppRates (0x0060) uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, @@ -5155,7 +5116,7 @@ uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tim. */ -#define SigIeTIM (0x0062) +#define SigIeTIM (0x0061) uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, @@ -5177,7 +5138,7 @@ uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_report. */ -#define SigIeTPCReport (0x0063) +#define SigIeTPCReport (0x0062) uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, @@ -5195,7 +5156,7 @@ uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_request. */ -#define SigIeTPCRequest (0x0064) +#define SigIeTPCRequest (0x0063) uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, @@ -5220,7 +5181,7 @@ uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_time_advertisement. */ -#define SigIeTimeAdvertisement (0x0065) +#define SigIeTimeAdvertisement (0x0064) uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, @@ -5242,7 +5203,7 @@ uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_timeout_interval. */ -#define SigIeTimeoutInterval (0x0066) +#define SigIeTimeoutInterval (0x0065) uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, @@ -5273,7 +5234,7 @@ uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vht_ext_bss_load. */ -#define SigIeVHTExtBssLoad (0x0067) +#define SigIeVHTExtBssLoad (0x0066) uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, @@ -5291,7 +5252,7 @@ uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor1_ie. */ -#define SigIeVendor1IE (0x0068) +#define SigIeVendor1IE (0x0067) uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, @@ -5309,7 +5270,7 @@ uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor3_ie. */ -#define SigIeVendor3IE (0x0069) +#define SigIeVendor3IE (0x0068) uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, @@ -5319,7 +5280,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp62__; + uint16_t tmp61__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -5356,11 +5317,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, &tmp62__, pBuf, 0); + framesntohs(pCtx, &tmp61__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->preauth = tmp62__ >> 0 & 0x1; - pDst->reserved = tmp62__ >> 1 & 0x7fff; + pDst->preauth = tmp61__ >> 0 & 0x1; + pDst->reserved = tmp61__ >> 1 & 0x7fff; if (!ielen) { pDst->bkid_count = 0U; return 0U; @@ -5379,7 +5340,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi. */ -#define SigIeWAPI (0x006a) +#define SigIeWAPI (0x0069) uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, @@ -5404,7 +5365,7 @@ uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi_opaque. */ -#define SigIeWAPIOpaque (0x006b) +#define SigIeWAPIOpaque (0x006a) uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, @@ -5426,7 +5387,7 @@ uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfatpc. */ -#define SigIeWFATPC (0x006c) +#define SigIeWFATPC (0x006b) uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, @@ -5451,7 +5412,7 @@ uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfdie_opaque. */ -#define SigIeWFDIEOpaque (0x006d) +#define SigIeWFDIEOpaque (0x006c) uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, @@ -5461,7 +5422,7 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp63__; + uint8_t tmp62__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -5473,17 +5434,17 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, pDst->present = 0; return status | DOT11F_BAD_FIXED_VALUE; } - tmp63__ = *pBuf; - pDst->reserved = tmp63__ >> 0 & 0xf; - pDst->qack = tmp63__ >> 4 & 0x1; - pDst->queue_request = tmp63__ >> 5 & 0x1; - pDst->txop_request = tmp63__ >> 6 & 0x1; - pDst->more_ack = tmp63__ >> 7 & 0x1; + tmp62__ = *pBuf; + pDst->reserved = tmp62__ >> 0 & 0xf; + pDst->qack = tmp62__ >> 4 & 0x1; + pDst->queue_request = tmp62__ >> 5 & 0x1; + pDst->txop_request = tmp62__ >> 6 & 0x1; + pDst->more_ack = tmp62__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_caps. */ -#define SigIeWMMCaps (0x006e) +#define SigIeWMMCaps (0x006d) uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, @@ -5491,6 +5452,32 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, uint8_t ielen, tDot11fIEWMMInfoAp *pDst, bool append_ie) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp63__; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->version = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + tmp63__ = *pBuf; + pDst->param_set_count = tmp63__ >> 0 & 0xf; + pDst->reserved = tmp63__ >> 4 & 0x7; + pDst->uapsd = tmp63__ >> 7 & 0x1; + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_wmm_info_ap. */ + +#define SigIeWMMInfoAp (0x006e) + + +uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEWMMInfoStation *pDst, + bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; uint8_t tmp64__; @@ -5502,44 +5489,18 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, pBuf += 1; ielen -= (uint8_t)1; tmp64__ = *pBuf; - pDst->param_set_count = tmp64__ >> 0 & 0xf; - pDst->reserved = tmp64__ >> 4 & 0x7; - pDst->uapsd = tmp64__ >> 7 & 0x1; - (void)pCtx; - return status; -} /* End dot11f_unpack_ie_wmm_info_ap. */ - -#define SigIeWMMInfoAp (0x006f) - - -uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIEWMMInfoStation *pDst, - bool append_ie) -{ - uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp65__; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) - status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - pDst->version = *pBuf; - pBuf += 1; - ielen -= (uint8_t)1; - tmp65__ = *pBuf; - pDst->acvo_uapsd = tmp65__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp65__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp65__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp65__ >> 3 & 0x1; - pDst->reserved1 = tmp65__ >> 4 & 0x1; - pDst->max_sp_length = tmp65__ >> 5 & 0x3; - pDst->reserved2 = tmp65__ >> 7 & 0x1; + pDst->acvo_uapsd = tmp64__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp64__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp64__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp64__ >> 3 & 0x1; + pDst->reserved1 = tmp64__ >> 4 & 0x1; + pDst->max_sp_length = tmp64__ >> 5 & 0x3; + pDst->reserved2 = tmp64__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_info_station. */ -#define SigIeWMMInfoStation (0x0070) +#define SigIeWMMInfoStation (0x006f) uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, @@ -5549,6 +5510,7 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp65__; uint8_t tmp66__; uint8_t tmp67__; uint8_t tmp68__; @@ -5556,7 +5518,6 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t tmp70__; uint8_t tmp71__; uint8_t tmp72__; - uint8_t tmp73__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -5574,69 +5535,69 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, pDst->reserved2 = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + tmp65__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acbe_aifsn = tmp65__ >> 0 & 0xf; + pDst->acbe_acm = tmp65__ >> 4 & 0x1; + pDst->acbe_aci = tmp65__ >> 5 & 0x3; + pDst->unused1 = tmp65__ >> 7 & 0x1; tmp66__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp66__ >> 0 & 0xf; - pDst->acbe_acm = tmp66__ >> 4 & 0x1; - pDst->acbe_aci = tmp66__ >> 5 & 0x3; - pDst->unused1 = tmp66__ >> 7 & 0x1; - tmp67__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_acwmin = tmp67__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp67__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp66__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp66__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; + tmp67__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acbk_aifsn = tmp67__ >> 0 & 0xf; + pDst->acbk_acm = tmp67__ >> 4 & 0x1; + pDst->acbk_aci = tmp67__ >> 5 & 0x3; + pDst->unused2 = tmp67__ >> 7 & 0x1; tmp68__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp68__ >> 0 & 0xf; - pDst->acbk_acm = tmp68__ >> 4 & 0x1; - pDst->acbk_aci = tmp68__ >> 5 & 0x3; - pDst->unused2 = tmp68__ >> 7 & 0x1; - tmp69__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbk_acwmin = tmp69__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp69__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp68__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp68__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; + tmp69__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvi_aifsn = tmp69__ >> 0 & 0xf; + pDst->acvi_acm = tmp69__ >> 4 & 0x1; + pDst->acvi_aci = tmp69__ >> 5 & 0x3; + pDst->unused3 = tmp69__ >> 7 & 0x1; tmp70__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp70__ >> 0 & 0xf; - pDst->acvi_acm = tmp70__ >> 4 & 0x1; - pDst->acvi_aci = tmp70__ >> 5 & 0x3; - pDst->unused3 = tmp70__ >> 7 & 0x1; - tmp71__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvi_acwmin = tmp71__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp71__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp70__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp70__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; + tmp71__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_aifsn = tmp71__ >> 0 & 0xf; + pDst->acvo_acm = tmp71__ >> 4 & 0x1; + pDst->acvo_aci = tmp71__ >> 5 & 0x3; + pDst->unused4 = tmp71__ >> 7 & 0x1; tmp72__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp72__ >> 0 & 0xf; - pDst->acvo_acm = tmp72__ >> 4 & 0x1; - pDst->acvo_aci = tmp72__ >> 5 & 0x3; - pDst->unused4 = tmp72__ >> 7 & 0x1; - tmp73__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvo_acwmin = tmp73__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp73__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp72__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp72__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_params. */ -#define SigIeWMMParams (0x0071) +#define SigIeWMMParams (0x0070) uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, @@ -5710,7 +5671,7 @@ uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa. */ -#define SigIeWPA (0x0072) +#define SigIeWPA (0x0071) uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, @@ -5735,7 +5696,7 @@ uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa_opaque. */ -#define SigIeWPAOpaque (0x0073) +#define SigIeWPAOpaque (0x0072) static const tTLVDefn TLVS_WSC[] = { @@ -5826,7 +5787,7 @@ uint32_t dot11f_unpack_ie_wsc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc. */ -#define SigIeWSC (0x0074) +#define SigIeWSC (0x0073) static const tTLVDefn TLVS_WscAssocReq[] = { @@ -5858,7 +5819,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_req. */ -#define SigIeWscAssocReq (0x0075) +#define SigIeWscAssocReq (0x0074) static const tTLVDefn TLVS_WscAssocRes[] = { @@ -5890,7 +5851,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_res. */ -#define SigIeWscAssocRes (0x0076) +#define SigIeWscAssocRes (0x0075) static const tTLVDefn TLVS_WscBeacon[] = { @@ -5943,7 +5904,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon. */ -#define SigIeWscBeacon (0x0077) +#define SigIeWscBeacon (0x0076) static const tTLVDefn TLVS_WscBeaconProbeRes[] = { @@ -6021,7 +5982,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon_probe_res. */ -#define SigIeWscBeaconProbeRes (0x0078) +#define SigIeWscBeaconProbeRes (0x0077) uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, @@ -6046,7 +6007,7 @@ uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_ie_opaque. */ -#define SigIeWscIEOpaque (0x0079) +#define SigIeWscIEOpaque (0x0078) static const tTLVDefn TLVS_WscProbeReq[] = { @@ -6119,7 +6080,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_req. */ -#define SigIeWscProbeReq (0x007a) +#define SigIeWscProbeReq (0x0079) static const tTLVDefn TLVS_WscProbeRes[] = { @@ -6197,7 +6158,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_res. */ -#define SigIeWscProbeRes (0x007b) +#define SigIeWscProbeRes (0x007a) static const tTLVDefn TLVS_WscReassocRes[] = { @@ -6229,7 +6190,7 @@ uint32_t dot11f_unpack_ie_wsc_reassoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_reassoc_res. */ -#define SigIeWscReassocRes (0x007c) +#define SigIeWscReassocRes (0x007b) uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, @@ -6239,7 +6200,7 @@ uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp74__; + uint8_t tmp73__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -6247,14 +6208,14 @@ uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, pDst->countdown = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp74__ = *pBuf; - pDst->new_color = tmp74__ >> 0 & 0x3f; - pDst->reserved = tmp74__ >> 6 & 0x3; + tmp73__ = *pBuf; + pDst->new_color = tmp73__ >> 0 & 0x3f; + pDst->reserved = tmp73__ >> 6 & 0x3; (void)pCtx; return status; } /* End dot11f_unpack_ie_bss_color_change. */ -#define SigIebss_color_change (0x007d) +#define SigIebss_color_change (0x007c) uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx, @@ -6277,7 +6238,7 @@ uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_dh_parameter_element. */ -#define SigIedh_parameter_element (0x007e) +#define SigIedh_parameter_element (0x007d) uint32_t dot11f_unpack_ie_esp_information(tpAniSirGlobal pCtx, @@ -6302,7 +6263,7 @@ uint32_t dot11f_unpack_ie_esp_information(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_esp_information. */ -#define SigIeesp_information (0x007f) +#define SigIeesp_information (0x007e) uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, @@ -6330,7 +6291,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 (0x0080) +#define SigIeext_chan_switch_ann (0x007f) uint32_t dot11f_unpack_ie_fils_assoc_delay_info(tpAniSirGlobal pCtx, @@ -6349,7 +6310,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 (0x0081) +#define SigIefils_assoc_delay_info (0x0080) uint32_t dot11f_unpack_ie_fils_hlp_container(tpAniSirGlobal pCtx, @@ -6375,7 +6336,7 @@ uint32_t dot11f_unpack_ie_fils_hlp_container(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_hlp_container. */ -#define SigIefils_hlp_container (0x0082) +#define SigIefils_hlp_container (0x0081) uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, @@ -6385,30 +6346,30 @@ uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp75__; + uint16_t tmp74__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp75__, pBuf, 0); + framesntohs(pCtx, &tmp74__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->public_key_identifiers_cnt = tmp75__ >> 0 & 0x7; - pDst->realm_identifiers_cnt = tmp75__ >> 3 & 0x7; - pDst->is_ip_config_supported = tmp75__ >> 6 & 0x1; - pDst->is_cache_id_present = tmp75__ >> 7 & 0x1; - pDst->is_hessid_present = tmp75__ >> 8 & 0x1; - pDst->is_fils_sk_auth_supported = tmp75__ >> 9 & 0x1; - pDst->is_fils_sk_auth_pfs_supported = tmp75__ >> 10 & 0x1; - pDst->is_pk_auth_supported = tmp75__ >> 11 & 0x1; - pDst->reserved = tmp75__ >> 12 & 0xf; + pDst->public_key_identifiers_cnt = tmp74__ >> 0 & 0x7; + pDst->realm_identifiers_cnt = tmp74__ >> 3 & 0x7; + pDst->is_ip_config_supported = tmp74__ >> 6 & 0x1; + pDst->is_cache_id_present = tmp74__ >> 7 & 0x1; + pDst->is_hessid_present = tmp74__ >> 8 & 0x1; + pDst->is_fils_sk_auth_supported = tmp74__ >> 9 & 0x1; + pDst->is_fils_sk_auth_pfs_supported = tmp74__ >> 10 & 0x1; + pDst->is_pk_auth_supported = tmp74__ >> 11 & 0x1; + pDst->reserved = tmp74__ >> 12 & 0xf; pDst->num_variable_data = (uint8_t)(ielen); DOT11F_MEMCPY(pCtx, pDst->variable_data, pBuf, (ielen)); (void)pCtx; return status; } /* End dot11f_unpack_ie_fils_indication. */ -#define SigIefils_indication (0x0083) +#define SigIefils_indication (0x0082) uint32_t dot11f_unpack_ie_fils_kde(tpAniSirGlobal pCtx, @@ -6431,7 +6392,7 @@ uint32_t dot11f_unpack_ie_fils_kde(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_kde. */ -#define SigIefils_kde (0x0084) +#define SigIefils_kde (0x0083) uint32_t dot11f_unpack_ie_fils_key_confirmation(tpAniSirGlobal pCtx, @@ -6451,7 +6412,7 @@ uint32_t dot11f_unpack_ie_fils_key_confirmation(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_key_confirmation. */ -#define SigIefils_key_confirmation (0x0085) +#define SigIefils_key_confirmation (0x0084) uint32_t dot11f_unpack_ie_fils_nonce(tpAniSirGlobal pCtx, @@ -6470,7 +6431,7 @@ uint32_t dot11f_unpack_ie_fils_nonce(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_nonce. */ -#define SigIefils_nonce (0x0086) +#define SigIefils_nonce (0x0085) uint32_t dot11f_unpack_ie_fils_public_key(tpAniSirGlobal pCtx, @@ -6493,7 +6454,7 @@ uint32_t dot11f_unpack_ie_fils_public_key(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_public_key. */ -#define SigIefils_public_key (0x0087) +#define SigIefils_public_key (0x0086) uint32_t dot11f_unpack_ie_fils_session(tpAniSirGlobal pCtx, @@ -6512,7 +6473,7 @@ uint32_t dot11f_unpack_ie_fils_session(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_session. */ -#define SigIefils_session (0x0088) +#define SigIefils_session (0x0087) uint32_t dot11f_unpack_ie_fils_wrapped_data(tpAniSirGlobal pCtx, @@ -6532,7 +6493,7 @@ uint32_t dot11f_unpack_ie_fils_wrapped_data(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_wrapped_data. */ -#define SigIefils_wrapped_data (0x0089) +#define SigIefils_wrapped_data (0x0088) uint32_t dot11f_unpack_ie_fragment_ie(tpAniSirGlobal pCtx, @@ -6552,21 +6513,9 @@ uint32_t dot11f_unpack_ie_fragment_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fragment_ie. */ -#define SigIefragment_ie (0x008a) +#define SigIefragment_ie (0x0089) -static const tFFDefn FFS_he_cap[] = { - { NULL, 0, 0, 0,}, -}; - -static const tIEDefn IES_he_cap[] = { - { offsetof(tDot11fIEhe_cap, ppe_threshold), - offsetof(tDot11fIEppe_threshold, present), 0, "ppe_threshold", - 0, 4, 27, SigIeppe_threshold, {0, 0, 0, 0, 0}, - 0, DOT11F_EID_PPE_THRESHOLD, 0, 0, }, - {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, -}; - uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, @@ -6574,108 +6523,108 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint32_t tmp76__; - uint8_t tmp77__; + uint32_t tmp75__; + uint8_t tmp76__; + uint32_t tmp77__; uint32_t tmp78__; - uint32_t tmp79__; - uint8_t tmp80__; + uint8_t tmp79__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohl(pCtx, &tmp76__, pBuf, 0); + framesntohl(pCtx, &tmp75__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->htc_he = tmp76__ >> 0 & 0x1; - pDst->twt_request = tmp76__ >> 1 & 0x1; - pDst->twt_responder = tmp76__ >> 2 & 0x1; - pDst->fragmentation = tmp76__ >> 3 & 0x3; - pDst->max_num_frag_msdu = tmp76__ >> 5 & 0x7; - pDst->min_frag_size = tmp76__ >> 8 & 0x3; - pDst->trigger_frm_mac_pad = tmp76__ >> 10 & 0x3; - pDst->multi_tid_aggr = tmp76__ >> 12 & 0x7; - pDst->he_link_adaptation = tmp76__ >> 15 & 0x3; - pDst->all_ack = tmp76__ >> 17 & 0x1; - pDst->ul_mu_rsp_sched = tmp76__ >> 18 & 0x1; - pDst->a_bsr = tmp76__ >> 19 & 0x1; - pDst->broadcast_twt = tmp76__ >> 20 & 0x1; - pDst->ba_32bit_bitmap = tmp76__ >> 21 & 0x1; - pDst->mu_cascade = tmp76__ >> 22 & 0x1; - pDst->ack_enabled_multitid = tmp76__ >> 23 & 0x1; - pDst->dl_mu_ba = tmp76__ >> 24 & 0x1; - pDst->omi_a_ctrl = tmp76__ >> 25 & 0x1; - pDst->ofdma_ra = tmp76__ >> 26 & 0x1; - pDst->max_ampdu_len = tmp76__ >> 27 & 0x3; - pDst->amsdu_frag = tmp76__ >> 29 & 0x1; - pDst->flex_twt_sched = tmp76__ >> 30 & 0x1; - pDst->rx_ctrl_frame = tmp76__ >> 31 & 0x1; - tmp77__ = *pBuf; + pDst->htc_he = tmp75__ >> 0 & 0x1; + pDst->twt_request = tmp75__ >> 1 & 0x1; + pDst->twt_responder = tmp75__ >> 2 & 0x1; + pDst->fragmentation = tmp75__ >> 3 & 0x3; + pDst->max_num_frag_msdu = tmp75__ >> 5 & 0x7; + pDst->min_frag_size = tmp75__ >> 8 & 0x3; + pDst->trigger_frm_mac_pad = tmp75__ >> 10 & 0x3; + pDst->multi_tid_aggr = tmp75__ >> 12 & 0x7; + pDst->he_link_adaptation = tmp75__ >> 15 & 0x3; + pDst->all_ack = tmp75__ >> 17 & 0x1; + pDst->ul_mu_rsp_sched = tmp75__ >> 18 & 0x1; + pDst->a_bsr = tmp75__ >> 19 & 0x1; + pDst->broadcast_twt = tmp75__ >> 20 & 0x1; + pDst->ba_32bit_bitmap = tmp75__ >> 21 & 0x1; + pDst->mu_cascade = tmp75__ >> 22 & 0x1; + pDst->ack_enabled_multitid = tmp75__ >> 23 & 0x1; + pDst->dl_mu_ba = tmp75__ >> 24 & 0x1; + pDst->omi_a_ctrl = tmp75__ >> 25 & 0x1; + pDst->ofdma_ra = tmp75__ >> 26 & 0x1; + pDst->max_ampdu_len = tmp75__ >> 27 & 0x3; + pDst->amsdu_frag = tmp75__ >> 29 & 0x1; + pDst->flex_twt_sched = tmp75__ >> 30 & 0x1; + pDst->rx_ctrl_frame = tmp75__ >> 31 & 0x1; + tmp76__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->bsrp_ampdu_aggr = tmp77__ >> 0 & 0x1; - pDst->qtp = tmp77__ >> 1 & 0x1; - pDst->a_bqr = tmp77__ >> 2 & 0x1; - pDst->sr_responder = tmp77__ >> 3 & 0x1; - pDst->ndp_feedback_supp = tmp77__ >> 4 & 0x1; - pDst->ops_supp = tmp77__ >> 5 & 0x1; - pDst->amsdu_in_ampdu = tmp77__ >> 6 & 0x1; - pDst->reserved1 = tmp77__ >> 7 & 0x1; + pDst->bsrp_ampdu_aggr = tmp76__ >> 0 & 0x1; + pDst->qtp = tmp76__ >> 1 & 0x1; + pDst->a_bqr = tmp76__ >> 2 & 0x1; + pDst->sr_responder = tmp76__ >> 3 & 0x1; + pDst->ndp_feedback_supp = tmp76__ >> 4 & 0x1; + pDst->ops_supp = tmp76__ >> 5 & 0x1; + pDst->amsdu_in_ampdu = tmp76__ >> 6 & 0x1; + pDst->reserved1 = tmp76__ >> 7 & 0x1; + framesntohl(pCtx, &tmp77__, pBuf, 0); + pBuf += 4; + ielen -= 4; + pDst->dual_band = tmp77__ >> 0 & 0x1; + pDst->chan_width_0 = tmp77__ >> 1 & 0x1; + pDst->chan_width_1 = tmp77__ >> 2 & 0x1; + pDst->chan_width_2 = tmp77__ >> 3 & 0x1; + pDst->chan_width_3 = tmp77__ >> 4 & 0x1; + pDst->chan_width_4 = tmp77__ >> 5 & 0x1; + pDst->chan_width_5 = tmp77__ >> 6 & 0x1; + pDst->chan_width_6 = tmp77__ >> 7 & 0x1; + pDst->rx_pream_puncturing = tmp77__ >> 8 & 0xf; + pDst->device_class = tmp77__ >> 12 & 0x1; + pDst->ldpc_coding = tmp77__ >> 13 & 0x1; + pDst->he_1x_ltf_800_gi_ppdu = tmp77__ >> 14 & 0x1; + pDst->midamble_rx_max_nsts = tmp77__ >> 15 & 0x3; + pDst->he_4x_ltf_3200_gi_ndp = tmp77__ >> 17 & 0x1; + pDst->stbc_lt_80mhz = tmp77__ >> 18 & 0x3; + pDst->doppler = tmp77__ >> 20 & 0x3; + pDst->ul_mu = tmp77__ >> 22 & 0x3; + pDst->dcm_enc_tx = tmp77__ >> 24 & 0x7; + pDst->dcm_enc_rx = tmp77__ >> 27 & 0x7; + pDst->ul_he_mu = tmp77__ >> 30 & 0x1; + pDst->su_beamformer = tmp77__ >> 31 & 0x1; framesntohl(pCtx, &tmp78__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->dual_band = tmp78__ >> 0 & 0x1; - pDst->chan_width_0 = tmp78__ >> 1 & 0x1; - pDst->chan_width_1 = tmp78__ >> 2 & 0x1; - pDst->chan_width_2 = tmp78__ >> 3 & 0x1; - pDst->chan_width_3 = tmp78__ >> 4 & 0x1; - pDst->chan_width_4 = tmp78__ >> 5 & 0x1; - pDst->chan_width_5 = tmp78__ >> 6 & 0x1; - pDst->chan_width_6 = tmp78__ >> 7 & 0x1; - pDst->rx_pream_puncturing = tmp78__ >> 8 & 0xf; - pDst->device_class = tmp78__ >> 12 & 0x1; - pDst->ldpc_coding = tmp78__ >> 13 & 0x1; - pDst->he_1x_ltf_800_gi_ppdu = tmp78__ >> 14 & 0x1; - pDst->midamble_rx_max_nsts = tmp78__ >> 15 & 0x3; - pDst->he_4x_ltf_3200_gi_ndp = tmp78__ >> 17 & 0x1; - pDst->stbc_lt_80mhz = tmp78__ >> 18 & 0x3; - pDst->doppler = tmp78__ >> 20 & 0x3; - pDst->ul_mu = tmp78__ >> 22 & 0x3; - pDst->dcm_enc_tx = tmp78__ >> 24 & 0x7; - pDst->dcm_enc_rx = tmp78__ >> 27 & 0x7; - pDst->ul_he_mu = tmp78__ >> 30 & 0x1; - pDst->su_beamformer = tmp78__ >> 31 & 0x1; - framesntohl(pCtx, &tmp79__, pBuf, 0); - pBuf += 4; - ielen -= 4; - pDst->su_beamformee = tmp79__ >> 0 & 0x1; - pDst->mu_beamformer = tmp79__ >> 1 & 0x1; - pDst->bfee_sts_lt_80 = tmp79__ >> 2 & 0x7; - pDst->bfee_sts_gt_80 = tmp79__ >> 5 & 0x7; - pDst->num_sounding_lt_80 = tmp79__ >> 8 & 0x7; - pDst->num_sounding_gt_80 = tmp79__ >> 11 & 0x7; - pDst->su_feedback_tone16 = tmp79__ >> 14 & 0x1; - pDst->mu_feedback_tone16 = tmp79__ >> 15 & 0x1; - pDst->codebook_su = tmp79__ >> 16 & 0x1; - pDst->codebook_mu = tmp79__ >> 17 & 0x1; - pDst->beamforming_feedback = tmp79__ >> 18 & 0x7; - pDst->he_er_su_ppdu = tmp79__ >> 21 & 0x1; - pDst->dl_mu_mimo_part_bw = tmp79__ >> 22 & 0x1; - pDst->ppet_present = tmp79__ >> 23 & 0x1; - pDst->srp = tmp79__ >> 24 & 0x1; - pDst->power_boost = tmp79__ >> 25 & 0x1; - pDst->he_ltf_800_gi_4x = tmp79__ >> 26 & 0x1; - pDst->max_nc = tmp79__ >> 27 & 0x7; - pDst->stbc_gt_80mhz = tmp79__ >> 30 & 0x3; - tmp80__ = *pBuf; + pDst->su_beamformee = tmp78__ >> 0 & 0x1; + pDst->mu_beamformer = tmp78__ >> 1 & 0x1; + pDst->bfee_sts_lt_80 = tmp78__ >> 2 & 0x7; + pDst->bfee_sts_gt_80 = tmp78__ >> 5 & 0x7; + pDst->num_sounding_lt_80 = tmp78__ >> 8 & 0x7; + pDst->num_sounding_gt_80 = tmp78__ >> 11 & 0x7; + pDst->su_feedback_tone16 = tmp78__ >> 14 & 0x1; + pDst->mu_feedback_tone16 = tmp78__ >> 15 & 0x1; + pDst->codebook_su = tmp78__ >> 16 & 0x1; + pDst->codebook_mu = tmp78__ >> 17 & 0x1; + pDst->beamforming_feedback = tmp78__ >> 18 & 0x7; + pDst->he_er_su_ppdu = tmp78__ >> 21 & 0x1; + pDst->dl_mu_mimo_part_bw = tmp78__ >> 22 & 0x1; + pDst->ppet_present = tmp78__ >> 23 & 0x1; + pDst->srp = tmp78__ >> 24 & 0x1; + pDst->power_boost = tmp78__ >> 25 & 0x1; + pDst->he_ltf_800_gi_4x = tmp78__ >> 26 & 0x1; + pDst->max_nc = tmp78__ >> 27 & 0x7; + pDst->stbc_gt_80mhz = tmp78__ >> 30 & 0x3; + tmp79__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->er_he_ltf_800_gi_4x = tmp80__ >> 0 & 0x1; - pDst->he_ppdu_20_in_40Mhz_2G = tmp80__ >> 1 & 0x1; - pDst->he_ppdu_20_in_160_80p80Mhz = tmp80__ >> 2 & 0x1; - pDst->he_ppdu_80_in_160_80p80Mhz = tmp80__ >> 3 & 0x1; - pDst->er_1x_he_ltf_gi = tmp80__ >> 4 & 0x1; - pDst->midamble_rx_1x_he_ltf = tmp80__ >> 5 & 0x1; - pDst->reserved2 = tmp80__ >> 6 & 0x3; + pDst->er_he_ltf_800_gi_4x = tmp79__ >> 0 & 0x1; + pDst->he_ppdu_20_in_40Mhz_2G = tmp79__ >> 1 & 0x1; + pDst->he_ppdu_20_in_160_80p80Mhz = tmp79__ >> 2 & 0x1; + pDst->he_ppdu_80_in_160_80p80Mhz = tmp79__ >> 3 & 0x1; + pDst->er_1x_he_ltf_gi = tmp79__ >> 4 & 0x1; + pDst->midamble_rx_1x_he_ltf = tmp79__ >> 5 & 0x1; + pDst->reserved2 = tmp79__ >> 6 & 0x3; framesntohs(pCtx, &pDst->rx_he_mcs_map_lt_80, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -6714,19 +6663,24 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pDst->tx_he_mcs_map_80_80, pBuf, (pDst->chan_width_3 * 2)); pBuf += (pDst->chan_width_3 * 2); ielen -= (pDst->chan_width_3 * 2); + switch (pDst->ppet_present) { + case 1: + pDst->ppet.ppe_threshold.num_ppe_th = (uint8_t)(ielen); + if (ielen > 25) { + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->ppet.ppe_threshold.ppe_th, pBuf, (ielen)); + pBuf += (ielen); + ielen -= (ielen); + break; + } (void)pCtx; - status |= unpack_core(pCtx, - pBuf, - ielen, - FFS_he_cap, - IES_he_cap, - (uint8_t *)pDst, - sizeof(*pDst), - append_ie); return status; } /* End dot11f_unpack_ie_he_cap. */ -#define SigIehe_cap (0x008b) +#define SigIehe_cap (0x008a) uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, @@ -6736,25 +6690,25 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint32_t tmp81__; + uint32_t tmp80__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohl(pCtx, &tmp81__, pBuf, 0); + framesntohl(pCtx, &tmp80__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->bss_color = tmp81__ >> 0 & 0x3f; - pDst->default_pe = tmp81__ >> 6 & 0x7; - pDst->twt_required = tmp81__ >> 9 & 0x1; - pDst->rts_threshold = tmp81__ >> 10 & 0x3ff; - pDst->partial_bss_col = tmp81__ >> 20 & 0x1; - pDst->vht_oper_present = tmp81__ >> 21 & 0x1; - pDst->reserved1 = tmp81__ >> 22 & 0x3f; - pDst->mbssid_ap = tmp81__ >> 28 & 0x1; - pDst->tx_bssid_ind = tmp81__ >> 29 & 0x1; - pDst->bss_col_disabled = tmp81__ >> 30 & 0x1; - pDst->reserved2 = tmp81__ >> 31 & 0x1; + pDst->bss_color = tmp80__ >> 0 & 0x3f; + pDst->default_pe = tmp80__ >> 6 & 0x7; + pDst->twt_required = tmp80__ >> 9 & 0x1; + pDst->rts_threshold = tmp80__ >> 10 & 0x3ff; + pDst->partial_bss_col = tmp80__ >> 20 & 0x1; + pDst->vht_oper_present = tmp80__ >> 21 & 0x1; + pDst->reserved1 = tmp80__ >> 22 & 0x3f; + pDst->mbssid_ap = tmp80__ >> 28 & 0x1; + pDst->tx_bssid_ind = tmp80__ >> 29 & 0x1; + pDst->bss_col_disabled = tmp80__ >> 30 & 0x1; + pDst->reserved2 = tmp80__ >> 31 & 0x1; DOT11F_MEMCPY(pCtx, pDst->basic_mcs_nss, pBuf, 2); pBuf += 2; ielen -= (uint8_t)2; @@ -6782,7 +6736,7 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_he_op. */ -#define SigIehe_op (0x008c) +#define SigIehe_op (0x008b) uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, @@ -6792,18 +6746,18 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp82__; + uint8_t tmp81__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp82__ = *pBuf; + tmp81__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->dgaf_dis = tmp82__ >> 0 & 0x1; - pDst->hs_id_present = tmp82__ >> 1 & 0x3; - pDst->reserved = tmp82__ >> 3 & 0x1; - pDst->release_num = tmp82__ >> 4 & 0xf; + pDst->dgaf_dis = tmp81__ >> 0 & 0x1; + pDst->hs_id_present = tmp81__ >> 1 & 0x3; + pDst->reserved = tmp81__ >> 3 & 0x1; + pDst->release_num = tmp81__ >> 4 & 0xf; if (!ielen) { return 0U; } else { @@ -6824,7 +6778,7 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_hs20vendor_ie. */ -#define SigIehs20vendor_ie (0x008d) +#define SigIehs20vendor_ie (0x008c) uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, @@ -6834,23 +6788,23 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp83__; + uint8_t tmp82__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp83__ = *pBuf; - pDst->info_request = tmp83__ >> 0 & 0x1; - pDst->forty_mhz_intolerant = tmp83__ >> 1 & 0x1; - pDst->twenty_mhz_bsswidth_req = tmp83__ >> 2 & 0x1; - pDst->obss_scan_exemption_req = tmp83__ >> 3 & 0x1; - pDst->obss_scan_exemption_grant = tmp83__ >> 4 & 0x1; - pDst->unused = tmp83__ >> 5 & 0x7; + tmp82__ = *pBuf; + pDst->info_request = tmp82__ >> 0 & 0x1; + pDst->forty_mhz_intolerant = tmp82__ >> 1 & 0x1; + pDst->twenty_mhz_bsswidth_req = tmp82__ >> 2 & 0x1; + pDst->obss_scan_exemption_req = tmp82__ >> 3 & 0x1; + pDst->obss_scan_exemption_grant = tmp82__ >> 4 & 0x1; + pDst->unused = tmp82__ >> 5 & 0x7; (void)pCtx; return status; } /* End dot11f_unpack_ie_ht2040_bss_coexistence. */ -#define SigIeht2040_bss_coexistence (0x008e) +#define SigIeht2040_bss_coexistence (0x008d) uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, @@ -6878,7 +6832,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 (0x008f) +#define SigIeht2040_bss_intolerant_report (0x008e) uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, @@ -6888,6 +6842,7 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp83__; uint8_t tmp84__; uint8_t tmp85__; uint8_t tmp86__; @@ -6895,7 +6850,6 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp88__; uint8_t tmp89__; uint8_t tmp90__; - uint8_t tmp91__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -6903,69 +6857,69 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, pDst->qos = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + tmp83__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acbe_aifsn = tmp83__ >> 0 & 0xf; + pDst->acbe_acm = tmp83__ >> 4 & 0x1; + pDst->acbe_aci = tmp83__ >> 5 & 0x3; + pDst->unused1 = tmp83__ >> 7 & 0x1; tmp84__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp84__ >> 0 & 0xf; - pDst->acbe_acm = tmp84__ >> 4 & 0x1; - pDst->acbe_aci = tmp84__ >> 5 & 0x3; - pDst->unused1 = tmp84__ >> 7 & 0x1; - tmp85__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_acwmin = tmp85__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp85__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp84__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp84__ >> 4 & 0xf; pDst->acbe_muedca_timer = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + tmp85__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acbk_aifsn = tmp85__ >> 0 & 0xf; + pDst->acbk_acm = tmp85__ >> 4 & 0x1; + pDst->acbk_aci = tmp85__ >> 5 & 0x3; + pDst->unused2 = tmp85__ >> 7 & 0x1; tmp86__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp86__ >> 0 & 0xf; - pDst->acbk_acm = tmp86__ >> 4 & 0x1; - pDst->acbk_aci = tmp86__ >> 5 & 0x3; - pDst->unused2 = tmp86__ >> 7 & 0x1; - tmp87__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbk_acwmin = tmp87__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp87__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp86__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp86__ >> 4 & 0xf; pDst->acbk_muedca_timer = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + tmp87__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvi_aifsn = tmp87__ >> 0 & 0xf; + pDst->acvi_acm = tmp87__ >> 4 & 0x1; + pDst->acvi_aci = tmp87__ >> 5 & 0x3; + pDst->unused3 = tmp87__ >> 7 & 0x1; tmp88__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp88__ >> 0 & 0xf; - pDst->acvi_acm = tmp88__ >> 4 & 0x1; - pDst->acvi_aci = tmp88__ >> 5 & 0x3; - pDst->unused3 = tmp88__ >> 7 & 0x1; - tmp89__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvi_acwmin = tmp89__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp89__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp88__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp88__ >> 4 & 0xf; pDst->acvi_muedca_timer = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + tmp89__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_aifsn = tmp89__ >> 0 & 0xf; + pDst->acvo_acm = tmp89__ >> 4 & 0x1; + pDst->acvo_aci = tmp89__ >> 5 & 0x3; + pDst->unused4 = tmp89__ >> 7 & 0x1; tmp90__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp90__ >> 0 & 0xf; - pDst->acvo_acm = tmp90__ >> 4 & 0x1; - pDst->acvo_aci = tmp90__ >> 5 & 0x3; - pDst->unused4 = tmp90__ >> 7 & 0x1; - tmp91__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvo_acwmin = tmp91__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp91__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp90__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp90__ >> 4 & 0xf; pDst->acvo_muedca_timer = *pBuf; (void)pCtx; return status; } /* End dot11f_unpack_ie_mu_edca_param_set. */ -#define SigIemu_edca_param_set (0x0090) +#define SigIemu_edca_param_set (0x008f) uint32_t dot11f_unpack_ie_osen_ie(tpAniSirGlobal pCtx, @@ -6985,7 +6939,7 @@ uint32_t dot11f_unpack_ie_osen_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_osen_ie. */ -#define SigIeosen_ie (0x0091) +#define SigIeosen_ie (0x0090) uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, @@ -7004,7 +6958,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 (0x0092) +#define SigIesec_chan_offset_ele (0x0091) static const tFFDefn FFS_vendor_vht_ie[] = { @@ -7048,7 +7002,7 @@ uint32_t dot11f_unpack_ie_vendor_vht_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor_vht_ie. */ -#define SigIevendor_vht_ie (0x0093) +#define SigIevendor_vht_ie (0x0092) static const tFFDefn FFS_AddTSRequest[] = { @@ -7306,7 +7260,7 @@ static const tIEDefn IES_AssocRequest[] = { present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0}, 4, DOT11F_EID_QCN_IE, 0, 0, }, { offsetof(tDot11fAssocRequest, he_cap), offsetof(tDot11fIEhe_cap, - present), 0, "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, { offsetof(tDot11fAssocRequest, MBO_IE), offsetof(tDot11fIEMBO_IE, present), 0, "MBO_IE", 0, 6, 295, SigIeMBO_IE, {80, 111, 154, 22, 0}, @@ -7465,7 +7419,7 @@ static const tIEDefn IES_AssocResponse[] = { present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0}, 4, DOT11F_EID_QCN_IE, 0, 0, }, { offsetof(tDot11fAssocResponse, he_cap), offsetof(tDot11fIEhe_cap, - present), 0, "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, { offsetof(tDot11fAssocResponse, he_op), offsetof(tDot11fIEhe_op, present), 0, "he_op", 0, 8, 12, SigIehe_op, {0, 0, 0, 0, 0}, @@ -7758,7 +7712,7 @@ static const tIEDefn IES_Beacon[] = { "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0}, 4, DOT11F_EID_QCN_IE, 0, 0, }, { offsetof(tDot11fBeacon, he_cap), offsetof(tDot11fIEhe_cap, present), 0, - "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, { offsetof(tDot11fBeacon, he_op), offsetof(tDot11fIEhe_op, present), 0, "he_op", 0, 8, 12, SigIehe_op, {0, 0, 0, 0, 0}, @@ -7984,7 +7938,7 @@ static const tIEDefn IES_Beacon2[] = { "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0}, 4, DOT11F_EID_QCN_IE, 0, 0, }, { offsetof(tDot11fBeacon2, he_cap), offsetof(tDot11fIEhe_cap, present), 0, - "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, { offsetof(tDot11fBeacon2, he_op), offsetof(tDot11fIEhe_op, present), 0, "he_op", 0, 8, 12, SigIehe_op, {0, 0, 0, 0, 0}, @@ -8210,7 +8164,7 @@ static const tIEDefn IES_BeaconIEs[] = { 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0}, 4, DOT11F_EID_QCN_IE, 0, 0, }, { offsetof(tDot11fBeaconIEs, he_cap), offsetof(tDot11fIEhe_cap, present), - 0, "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + 0, "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, { offsetof(tDot11fBeaconIEs, he_op), offsetof(tDot11fIEhe_op, present), 0, "he_op", 0, 8, 12, SigIehe_op, {0, 0, 0, 0, 0}, @@ -8645,7 +8599,7 @@ static const tIEDefn IES_ProbeRequest[] = { present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0}, 4, DOT11F_EID_QCN_IE, 0, 0, }, { offsetof(tDot11fProbeRequest, he_cap), offsetof(tDot11fIEhe_cap, - present), 0, "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; @@ -8855,7 +8809,7 @@ static const tIEDefn IES_ProbeResponse[] = { present), 0, "QCN_IE", 0, 10, 10, SigIeQCN_IE, {140, 253, 240, 1, 0}, 4, DOT11F_EID_QCN_IE, 0, 0, }, { offsetof(tDot11fProbeResponse, he_cap), offsetof(tDot11fIEhe_cap, - present), 0, "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, { offsetof(tDot11fProbeResponse, he_op), offsetof(tDot11fIEhe_op, present), 0, "he_op", 0, 8, 12, SigIehe_op, {0, 0, 0, 0, 0}, @@ -9118,7 +9072,7 @@ static const tIEDefn IES_ReAssocRequest[] = { 0, 7, 9, SigIehs20vendor_ie, {80, 111, 154, 16, 0}, 4, DOT11F_EID_HS20VENDOR_IE, 0, 0, }, { offsetof(tDot11fReAssocRequest, he_cap), offsetof(tDot11fIEhe_cap, - present), 0, "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; @@ -9254,7 +9208,7 @@ static const tIEDefn IES_ReAssocResponse[] = { 0, 7, 28, SigIevendor_vht_ie, {0, 144, 76, 4, 0}, 4, DOT11F_EID_VENDOR_VHT_IE, 0, 0, }, { offsetof(tDot11fReAssocResponse, he_cap), offsetof(tDot11fIEhe_cap, - present), 0, "he_cap", 0, 20, 55, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 53, SigIehe_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_CAP, 35, 0, }, { offsetof(tDot11fReAssocResponse, he_op), offsetof(tDot11fIEhe_op, present), 0, "he_op", 0, 8, 12, SigIehe_op, {0, 0, 0, 0, 0}, @@ -10656,16 +10610,6 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, countOffset), append_ie); break; - case SigIeppe_threshold: - status |= - dot11f_unpack_ie_ppe_threshold( - pCtx, pBufRemaining, len, - (tDot11fIEppe_threshold *) - (pFrm + pIe->offset + - sizeof(tDot11fIEppe_threshold) * - countOffset), - append_ie); - break; case SigIeAPChannelReport: status |= dot11f_unpack_ie_ap_channel_report( @@ -13353,8 +13297,15 @@ uint32_t dot11f_get_packed_ie_he_cap(tpAniSirGlobal pCtx, *pnNeeded += (pIe->chan_width_2 * 2); *pnNeeded += (pIe->chan_width_3 * 2); *pnNeeded += (pIe->chan_width_3 * 2); - status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, - IES_he_cap); + if (pIe->ppet_present) { + switch (pIe->ppet_present) { + case 1: + *pnNeeded += pIe->ppet.ppe_threshold.num_ppe_th; + break; + } + } else { + break; + } break; } return status; @@ -14004,15 +13955,6 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; - case SigIeppe_threshold: - offset = sizeof(tDot11fIEppe_threshold); - byteCount = ((tDot11fIEppe_threshold *) - (pFrm + pIe->offset + offset * i))-> - num_ppet + 1; - pIePresent = ((tDot11fIEppe_threshold *) - (pFrm + pIe->offset + offset * i))-> - present; - break; case SigIeAPChannelReport: offset = sizeof(tDot11fIEAPChannelReport); byteCount = ((tDot11fIEAPChannelReport *) @@ -15457,25 +15399,25 @@ void dot11f_pack_ff_capabilities(tpAniSirGlobal pCtx, tDot11fFfCapabilities *pSrc, uint8_t *pBuf) { - uint16_t tmp92__; - tmp92__ = 0U; - tmp92__ |= (pSrc->ess << 0); - tmp92__ |= (pSrc->ibss << 1); - tmp92__ |= (pSrc->cfPollable << 2); - tmp92__ |= (pSrc->cfPollReq << 3); - tmp92__ |= (pSrc->privacy << 4); - tmp92__ |= (pSrc->shortPreamble << 5); - tmp92__ |= (pSrc->pbcc << 6); - tmp92__ |= (pSrc->channelAgility << 7); - tmp92__ |= (pSrc->spectrumMgt << 8); - tmp92__ |= (pSrc->qos << 9); - tmp92__ |= (pSrc->shortSlotTime << 10); - tmp92__ |= (pSrc->apsd << 11); - tmp92__ |= (pSrc->rrm << 12); - tmp92__ |= (pSrc->dsssOfdm << 13); - tmp92__ |= (pSrc->delayedBA << 14); - tmp92__ |= (pSrc->immediateBA << 15); - frameshtons(pCtx, pBuf, tmp92__, 0); + uint16_t tmp91__; + tmp91__ = 0U; + tmp91__ |= (pSrc->ess << 0); + tmp91__ |= (pSrc->ibss << 1); + tmp91__ |= (pSrc->cfPollable << 2); + tmp91__ |= (pSrc->cfPollReq << 3); + tmp91__ |= (pSrc->privacy << 4); + tmp91__ |= (pSrc->shortPreamble << 5); + tmp91__ |= (pSrc->pbcc << 6); + tmp91__ |= (pSrc->channelAgility << 7); + tmp91__ |= (pSrc->spectrumMgt << 8); + tmp91__ |= (pSrc->qos << 9); + tmp91__ |= (pSrc->shortSlotTime << 10); + tmp91__ |= (pSrc->apsd << 11); + tmp91__ |= (pSrc->rrm << 12); + tmp91__ |= (pSrc->dsssOfdm << 13); + tmp91__ |= (pSrc->delayedBA << 14); + tmp91__ |= (pSrc->immediateBA << 15); + frameshtons(pCtx, pBuf, tmp91__, 0); (void)pCtx; } /* End dot11f_pack_ff_capabilities. */ @@ -15539,13 +15481,13 @@ void dot11f_pack_ff_operating_mode(tpAniSirGlobal pCtx, tDot11fFfOperatingMode *pSrc, uint8_t *pBuf) { - uint8_t tmp93__; - tmp93__ = 0U; - tmp93__ |= (pSrc->chanWidth << 0); - tmp93__ |= (pSrc->reserved << 2); - tmp93__ |= (pSrc->rxNSS << 4); - tmp93__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp93__; + uint8_t tmp92__; + tmp92__ = 0U; + tmp92__ |= (pSrc->chanWidth << 0); + tmp92__ |= (pSrc->reserved << 2); + tmp92__ |= (pSrc->rxNSS << 4); + tmp92__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp92__; (void)pCtx; } /* End dot11f_pack_ff_operating_mode. */ @@ -15585,12 +15527,12 @@ void dot11f_pack_ff_sm_power_mode_set(tpAniSirGlobal pCtx, tDot11fFfSMPowerModeSet *pSrc, uint8_t *pBuf) { - uint8_t tmp94__; - tmp94__ = 0U; - tmp94__ |= (pSrc->PowerSave_En << 0); - tmp94__ |= (pSrc->Mode << 1); - tmp94__ |= (pSrc->reserved << 2); - *pBuf = tmp94__; + uint8_t tmp93__; + tmp93__ = 0U; + tmp93__ |= (pSrc->PowerSave_En << 0); + tmp93__ |= (pSrc->Mode << 1); + tmp93__ |= (pSrc->reserved << 2); + *pBuf = tmp93__; (void)pCtx; } /* End dot11f_pack_ff_sm_power_mode_set. */ @@ -15630,19 +15572,19 @@ void dot11f_pack_ff_ts_info(tpAniSirGlobal pCtx, tDot11fFfTSInfo *pSrc, uint8_t *pBuf) { - uint32_t tmp95__; - tmp95__ = 0U; - tmp95__ |= (pSrc->traffic_type << 0); - tmp95__ |= (pSrc->tsid << 1); - tmp95__ |= (pSrc->direction << 5); - tmp95__ |= (pSrc->access_policy << 7); - tmp95__ |= (pSrc->aggregation << 9); - tmp95__ |= (pSrc->psb << 10); - tmp95__ |= (pSrc->user_priority << 11); - tmp95__ |= (pSrc->tsinfo_ack_pol << 14); - tmp95__ |= (pSrc->schedule << 16); - tmp95__ |= (pSrc->unused << 17); - frameshtonl(pCtx, pBuf, tmp95__, 0); + uint32_t tmp94__; + tmp94__ = 0U; + tmp94__ |= (pSrc->traffic_type << 0); + tmp94__ |= (pSrc->tsid << 1); + tmp94__ |= (pSrc->direction << 5); + tmp94__ |= (pSrc->access_policy << 7); + tmp94__ |= (pSrc->aggregation << 9); + tmp94__ |= (pSrc->psb << 10); + tmp94__ |= (pSrc->user_priority << 11); + tmp94__ |= (pSrc->tsinfo_ack_pol << 14); + tmp94__ |= (pSrc->schedule << 16); + tmp94__ |= (pSrc->unused << 17); + frameshtonl(pCtx, pBuf, tmp94__, 0); (void)pCtx; } /* End dot11f_pack_ff_ts_info. */ @@ -15698,13 +15640,13 @@ void dot11f_pack_ff_addba_param_set(tpAniSirGlobal pCtx, tDot11fFfaddba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp96__; - tmp96__ = 0U; - tmp96__ |= (pSrc->amsdu_supp << 0); - tmp96__ |= (pSrc->policy << 1); - tmp96__ |= (pSrc->tid << 2); - tmp96__ |= (pSrc->buff_size << 6); - frameshtons(pCtx, pBuf, tmp96__, 0); + uint16_t tmp95__; + tmp95__ = 0U; + tmp95__ |= (pSrc->amsdu_supp << 0); + tmp95__ |= (pSrc->policy << 1); + tmp95__ |= (pSrc->tid << 2); + tmp95__ |= (pSrc->buff_size << 6); + frameshtons(pCtx, pBuf, tmp95__, 0); (void)pCtx; } /* End dot11f_pack_ff_addba_param_set. */ @@ -15712,11 +15654,11 @@ void dot11f_pack_ff_ba_start_seq_ctrl(tpAniSirGlobal pCtx, tDot11fFfba_start_seq_ctrl *pSrc, uint8_t *pBuf) { - uint16_t tmp97__; - tmp97__ = 0U; - tmp97__ |= (pSrc->frag_number << 0); - tmp97__ |= (pSrc->ssn << 4); - frameshtons(pCtx, pBuf, tmp97__, 0); + uint16_t tmp96__; + tmp96__ = 0U; + tmp96__ |= (pSrc->frag_number << 0); + tmp96__ |= (pSrc->ssn << 4); + frameshtons(pCtx, pBuf, tmp96__, 0); (void)pCtx; } /* End dot11f_pack_ff_ba_start_seq_ctrl. */ @@ -15732,12 +15674,12 @@ void dot11f_pack_ff_delba_param_set(tpAniSirGlobal pCtx, tDot11fFfdelba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp98__; - tmp98__ = 0U; - tmp98__ |= (pSrc->reserved << 0); - tmp98__ |= (pSrc->initiator << 11); - tmp98__ |= (pSrc->tid << 12); - frameshtons(pCtx, pBuf, tmp98__, 0); + uint16_t tmp97__; + tmp97__ = 0U; + tmp97__ |= (pSrc->reserved << 0); + tmp97__ |= (pSrc->initiator << 11); + tmp97__ |= (pSrc->tid << 12); + frameshtons(pCtx, pBuf, tmp97__, 0); (void)pCtx; } /* End dot11f_pack_ff_delba_param_set. */ @@ -15745,13 +15687,13 @@ void dot11f_pack_ff_ext_chan_switch_ann_action(tpAniSirGlobal pCtx, tDot11fFfext_chan_switch_ann_action *pSrc, uint8_t *pBuf) { - uint32_t tmp99__; - tmp99__ = 0U; - tmp99__ |= (pSrc->switch_mode << 0); - tmp99__ |= (pSrc->op_class << 8); - tmp99__ |= (pSrc->new_channel << 16); - tmp99__ |= (pSrc->switch_count << 24); - frameshtonl(pCtx, pBuf, tmp99__, 0); + uint32_t tmp98__; + tmp98__ = 0U; + tmp98__ |= (pSrc->switch_mode << 0); + tmp98__ |= (pSrc->op_class << 8); + tmp98__ |= (pSrc->new_channel << 16); + tmp98__ |= (pSrc->switch_count << 24); + frameshtonl(pCtx, pBuf, tmp98__, 0); (void)pCtx; } /* End dot11f_pack_ff_ext_chan_switch_ann_action. */ @@ -15838,7 +15780,7 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp100__; + uint8_t tmp99__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -15847,10 +15789,10 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp100__ = 0U; - tmp100__ |= (pSrc->minor << 0); - tmp100__ |= (pSrc->major << 4); - *pBuf = tmp100__; + tmp99__ = 0U; + tmp99__ |= (pSrc->minor << 0); + tmp99__ |= (pSrc->major << 4); + *pBuf = tmp99__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16807,7 +16749,7 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp101__; + uint8_t tmp100__; nNeeded += 5; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -16816,10 +16758,10 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, pBuf += 2; *pnConsumed += 2; pTlvLen = pBuf; pBuf += 2; *pnConsumed += 2; - tmp101__ = 0U; - tmp101__ |= (pSrc->minor << 0); - tmp101__ |= (pSrc->major << 4); - *pBuf = tmp101__; + tmp100__ = 0U; + tmp100__ |= (pSrc->minor << 0); + tmp100__ |= (pSrc->major << 4); + *pBuf = tmp100__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17048,7 +16990,7 @@ uint32_t dot11f_pack_tlv_oce_cap(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp102__; + uint8_t tmp101__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -17057,12 +16999,12 @@ uint32_t dot11f_pack_tlv_oce_cap(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp102__ = 0U; - tmp102__ |= (pSrc->oce_release << 0); - tmp102__ |= (pSrc->is_sta_cfon << 3); - tmp102__ |= (pSrc->non_oce_ap_present << 4); - tmp102__ |= (pSrc->reserved << 5); - *pBuf = tmp102__; + tmp101__ = 0U; + tmp101__ |= (pSrc->oce_release << 0); + tmp101__ |= (pSrc->is_sta_cfon << 3); + tmp101__ |= (pSrc->non_oce_ap_present << 4); + tmp101__ |= (pSrc->reserved << 5); + *pBuf = tmp101__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17084,7 +17026,7 @@ uint32_t dot11f_pack_tlv_reduced_wan_metrics(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp103__; + uint8_t tmp102__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -17093,10 +17035,10 @@ uint32_t dot11f_pack_tlv_reduced_wan_metrics(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp103__ = 0U; - tmp103__ |= (pSrc->downlink_av_cap << 0); - tmp103__ |= (pSrc->uplink_av_cap << 4); - *pBuf = tmp103__; + tmp102__ = 0U; + tmp102__ |= (pSrc->downlink_av_cap << 0); + tmp102__ |= (pSrc->uplink_av_cap << 4); + *pBuf = tmp102__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17266,7 +17208,7 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp104__; + uint16_t tmp103__; nNeeded += (pSrc->num_key + 11); while (pSrc->present) { if (nNeeded > nBuf) @@ -17275,10 +17217,10 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp104__ = 0U; - tmp104__ |= (pSrc->keyId << 0); - tmp104__ |= (pSrc->reserved << 2); - frameshtons(pCtx, pBuf, tmp104__, 0); + tmp103__ = 0U; + tmp103__ |= (pSrc->keyId << 0); + tmp103__ |= (pSrc->reserved << 2); + frameshtons(pCtx, pBuf, tmp103__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -17396,53 +17338,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_ppe_threshold(tpAniSirGlobal pCtx, - tDot11fIEppe_threshold *pSrc, - uint8_t *pBuf, - uint32_t nBuf, - uint32_t *pnConsumed) -{ - uint8_t *pIeLen = 0; - uint32_t nConsumedOnEntry = *pnConsumed; - uint32_t nNeeded = 0U; - uint8_t ru_mask, ru_count; - uint8_t tmp105__; - nNeeded += (pSrc->num_ppet + 1); - while (pSrc->present) { - if (nNeeded > nBuf) - return DOT11F_BUFFER_OVERFLOW; - *pBuf = 1; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - tmp105__ = 0U; - tmp105__ |= (pSrc->nss_count << 0); - tmp105__ |= (pSrc->ru_idx_mask << 3); - tmp105__ |= (pSrc->ppet_b1 << 7); - *pBuf = tmp105__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - ru_mask = pSrc->ru_idx_mask; - for (ru_count = 0; ru_mask; ru_mask >>= 1) - if (ru_mask & 0x1) - ru_count++; - - if (pSrc->num_ppet != - ((pSrc->nss_count + 1) * ru_count * 6 - 1) / 8 + 1) - return DOT11F_BAD_INPUT_BUFFER; - DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->ppet), pSrc->num_ppet); - *pnConsumed += pSrc->num_ppet; - /* fieldsEndFlag = 1 */ - break; - } - (void)pCtx; - if (pIeLen) { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_ppe_threshold. */ - uint32_t dot11f_pack_ie_ap_channel_report(tpAniSirGlobal pCtx, tDot11fIEAPChannelReport *pSrc, uint8_t *pBuf, @@ -17734,11 +17629,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 tmp104__; + uint8_t tmp105__; uint8_t tmp106__; uint8_t tmp107__; uint8_t tmp108__; - uint8_t tmp109__; - uint8_t tmp110__; nNeeded += 5; while (pSrc->present) { if (nNeeded > nBuf) @@ -17747,60 +17642,60 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); + tmp104__ = 0U; + tmp104__ |= (pSrc->LinkMeasurement << 0); + tmp104__ |= (pSrc->NeighborRpt << 1); + tmp104__ |= (pSrc->parallel << 2); + tmp104__ |= (pSrc->repeated << 3); + tmp104__ |= (pSrc->BeaconPassive << 4); + tmp104__ |= (pSrc->BeaconActive << 5); + tmp104__ |= (pSrc->BeaconTable << 6); + tmp104__ |= (pSrc->BeaconRepCond << 7); + *pBuf = tmp104__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp105__ = 0U; + tmp105__ |= (pSrc->FrameMeasurement << 0); + tmp105__ |= (pSrc->ChannelLoad << 1); + tmp105__ |= (pSrc->NoiseHistogram << 2); + tmp105__ |= (pSrc->statistics << 3); + tmp105__ |= (pSrc->LCIMeasurement << 4); + tmp105__ |= (pSrc->LCIAzimuth << 5); + tmp105__ |= (pSrc->TCMCapability << 6); + tmp105__ |= (pSrc->triggeredTCM << 7); + *pBuf = tmp105__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; tmp106__ = 0U; - tmp106__ |= (pSrc->LinkMeasurement << 0); - tmp106__ |= (pSrc->NeighborRpt << 1); - tmp106__ |= (pSrc->parallel << 2); - tmp106__ |= (pSrc->repeated << 3); - tmp106__ |= (pSrc->BeaconPassive << 4); - tmp106__ |= (pSrc->BeaconActive << 5); - tmp106__ |= (pSrc->BeaconTable << 6); - tmp106__ |= (pSrc->BeaconRepCond << 7); + tmp106__ |= (pSrc->APChanReport << 0); + tmp106__ |= (pSrc->RRMMIBEnabled << 1); + tmp106__ |= (pSrc->operatingChanMax << 2); + tmp106__ |= (pSrc->nonOperatinChanMax << 5); *pBuf = tmp106__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp107__ = 0U; - tmp107__ |= (pSrc->FrameMeasurement << 0); - tmp107__ |= (pSrc->ChannelLoad << 1); - tmp107__ |= (pSrc->NoiseHistogram << 2); - tmp107__ |= (pSrc->statistics << 3); - tmp107__ |= (pSrc->LCIMeasurement << 4); - tmp107__ |= (pSrc->LCIAzimuth << 5); - tmp107__ |= (pSrc->TCMCapability << 6); - tmp107__ |= (pSrc->triggeredTCM << 7); + tmp107__ |= (pSrc->MeasurementPilot << 0); + tmp107__ |= (pSrc->MeasurementPilotEnabled << 3); + tmp107__ |= (pSrc->NeighborTSFOffset << 4); + tmp107__ |= (pSrc->RCPIMeasurement << 5); + tmp107__ |= (pSrc->RSNIMeasurement << 6); + tmp107__ |= (pSrc->BssAvgAccessDelay << 7); *pBuf = tmp107__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp108__ = 0U; - tmp108__ |= (pSrc->APChanReport << 0); - tmp108__ |= (pSrc->RRMMIBEnabled << 1); - tmp108__ |= (pSrc->operatingChanMax << 2); - tmp108__ |= (pSrc->nonOperatinChanMax << 5); + tmp108__ |= (pSrc->BSSAvailAdmission << 0); + tmp108__ |= (pSrc->AntennaInformation << 1); + tmp108__ |= (pSrc->fine_time_meas_rpt << 2); + tmp108__ |= (pSrc->lci_capability << 3); + tmp108__ |= (pSrc->reserved << 4); *pBuf = tmp108__; *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp109__ = 0U; - tmp109__ |= (pSrc->MeasurementPilot << 0); - tmp109__ |= (pSrc->MeasurementPilotEnabled << 3); - tmp109__ |= (pSrc->NeighborTSFOffset << 4); - tmp109__ |= (pSrc->RCPIMeasurement << 5); - tmp109__ |= (pSrc->RSNIMeasurement << 6); - tmp109__ |= (pSrc->BssAvgAccessDelay << 7); - *pBuf = tmp109__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp110__ = 0U; - tmp110__ |= (pSrc->BSSAvailAdmission << 0); - tmp110__ |= (pSrc->AntennaInformation << 1); - tmp110__ |= (pSrc->fine_time_meas_rpt << 2); - tmp110__ |= (pSrc->lci_capability << 3); - tmp110__ |= (pSrc->reserved << 4); - *pBuf = tmp110__; - *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; break; @@ -17879,7 +17774,7 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp111__; + uint16_t tmp109__; nNeeded += 14; while (pSrc->present) { if (nNeeded > nBuf) @@ -17888,12 +17783,12 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp111__ = 0U; - tmp111__ |= (pSrc->aggregation << 0); - tmp111__ |= (pSrc->tsid << 1); - tmp111__ |= (pSrc->direction << 5); - tmp111__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp111__, 0); + tmp109__ = 0U; + tmp109__ |= (pSrc->aggregation << 0); + tmp109__ |= (pSrc->tsid << 1); + tmp109__ |= (pSrc->direction << 5); + tmp109__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp109__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18120,9 +18015,9 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint16_t tmp110__; + uint8_t tmp111__; uint16_t tmp112__; - uint8_t tmp113__; - uint16_t tmp114__; nNeeded += 55; while (pSrc->present) { if (nNeeded > nBuf) @@ -18131,30 +18026,30 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp112__ = 0U; - tmp112__ |= (pSrc->traffic_type << 0); - tmp112__ |= (pSrc->tsid << 1); - tmp112__ |= (pSrc->direction << 5); - tmp112__ |= (pSrc->access_policy << 7); - tmp112__ |= (pSrc->aggregation << 9); - tmp112__ |= (pSrc->psb << 10); - tmp112__ |= (pSrc->user_priority << 11); - tmp112__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp112__, 0); + tmp110__ = 0U; + tmp110__ |= (pSrc->traffic_type << 0); + tmp110__ |= (pSrc->tsid << 1); + tmp110__ |= (pSrc->direction << 5); + tmp110__ |= (pSrc->access_policy << 7); + tmp110__ |= (pSrc->aggregation << 9); + tmp110__ |= (pSrc->psb << 10); + tmp110__ |= (pSrc->user_priority << 11); + tmp110__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp110__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp113__ = 0U; - tmp113__ |= (pSrc->schedule << 0); - tmp113__ |= (pSrc->unused << 1); - *pBuf = tmp113__; + tmp111__ = 0U; + tmp111__ |= (pSrc->schedule << 0); + tmp111__ |= (pSrc->unused << 1); + *pBuf = tmp111__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp114__ = 0U; - tmp114__ |= (pSrc->size << 0); - tmp114__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp114__, 0); + tmp112__ = 0U; + tmp112__ |= (pSrc->size << 0); + tmp112__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp112__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18218,9 +18113,9 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp115__; - uint16_t tmp116__; - uint16_t tmp117__; + uint32_t tmp113__; + uint16_t tmp114__; + uint16_t tmp115__; nNeeded += 12; while (pSrc->present) { if (nNeeded > nBuf) @@ -18229,48 +18124,48 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp115__ = 0U; - tmp115__ |= (pSrc->maxMPDULen << 0); - tmp115__ |= (pSrc->supportedChannelWidthSet << 2); - tmp115__ |= (pSrc->ldpcCodingCap << 4); - tmp115__ |= (pSrc->shortGI80MHz << 5); - tmp115__ |= (pSrc->shortGI160and80plus80MHz << 6); - tmp115__ |= (pSrc->txSTBC << 7); - tmp115__ |= (pSrc->rxSTBC << 8); - tmp115__ |= (pSrc->suBeamFormerCap << 11); - tmp115__ |= (pSrc->suBeamformeeCap << 12); - tmp115__ |= (pSrc->csnofBeamformerAntSup << 13); - tmp115__ |= (pSrc->numSoundingDim << 16); - tmp115__ |= (pSrc->muBeamformerCap << 19); - tmp115__ |= (pSrc->muBeamformeeCap << 20); - tmp115__ |= (pSrc->vhtTXOPPS << 21); - tmp115__ |= (pSrc->htcVHTCap << 22); - tmp115__ |= (pSrc->maxAMPDULenExp << 23); - tmp115__ |= (pSrc->vhtLinkAdaptCap << 26); - tmp115__ |= (pSrc->rxAntPattern << 28); - tmp115__ |= (pSrc->txAntPattern << 29); - tmp115__ |= (pSrc->reserved1 << 30); - frameshtonl(pCtx, pBuf, tmp115__, 0); + tmp113__ = 0U; + tmp113__ |= (pSrc->maxMPDULen << 0); + tmp113__ |= (pSrc->supportedChannelWidthSet << 2); + tmp113__ |= (pSrc->ldpcCodingCap << 4); + tmp113__ |= (pSrc->shortGI80MHz << 5); + tmp113__ |= (pSrc->shortGI160and80plus80MHz << 6); + tmp113__ |= (pSrc->txSTBC << 7); + tmp113__ |= (pSrc->rxSTBC << 8); + tmp113__ |= (pSrc->suBeamFormerCap << 11); + tmp113__ |= (pSrc->suBeamformeeCap << 12); + tmp113__ |= (pSrc->csnofBeamformerAntSup << 13); + tmp113__ |= (pSrc->numSoundingDim << 16); + tmp113__ |= (pSrc->muBeamformerCap << 19); + tmp113__ |= (pSrc->muBeamformeeCap << 20); + tmp113__ |= (pSrc->vhtTXOPPS << 21); + tmp113__ |= (pSrc->htcVHTCap << 22); + tmp113__ |= (pSrc->maxAMPDULenExp << 23); + tmp113__ |= (pSrc->vhtLinkAdaptCap << 26); + tmp113__ |= (pSrc->rxAntPattern << 28); + tmp113__ |= (pSrc->txAntPattern << 29); + tmp113__ |= (pSrc->reserved1 << 30); + frameshtonl(pCtx, pBuf, tmp113__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp116__ = 0U; - tmp116__ |= (pSrc->rxHighSupDataRate << 0); - tmp116__ |= (pSrc->reserved2 << 13); - frameshtons(pCtx, pBuf, tmp116__, 0); + tmp114__ = 0U; + tmp114__ |= (pSrc->rxHighSupDataRate << 0); + tmp114__ |= (pSrc->reserved2 << 13); + frameshtons(pCtx, pBuf, tmp114__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp117__ = 0U; - tmp117__ |= (pSrc->txSupDataRate << 0); - tmp117__ |= (pSrc->reserved3 << 13); - frameshtons(pCtx, pBuf, tmp117__, 0); + tmp115__ = 0U; + tmp115__ |= (pSrc->txSupDataRate << 0); + tmp115__ |= (pSrc->reserved3 << 13); + frameshtons(pCtx, pBuf, tmp115__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -18330,7 +18225,7 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp118__; + uint16_t tmp116__; nNeeded += 15; while (pSrc->present) { if (nNeeded > nBuf) @@ -18352,12 +18247,12 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp118__ = 0U; - tmp118__ |= (pSrc->aggregation << 0); - tmp118__ |= (pSrc->tsid << 1); - tmp118__ |= (pSrc->direction << 5); - tmp118__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp118__, 0); + tmp116__ = 0U; + tmp116__ |= (pSrc->aggregation << 0); + tmp116__ |= (pSrc->tsid << 1); + tmp116__ |= (pSrc->direction << 5); + tmp116__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp116__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18591,9 +18486,9 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint16_t tmp117__; + uint8_t tmp118__; uint16_t tmp119__; - uint8_t tmp120__; - uint16_t tmp121__; nNeeded += 38; while (pSrc->present) { if (nNeeded > nBuf) @@ -18615,30 +18510,30 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp119__ = 0U; - tmp119__ |= (pSrc->traffic_type << 0); - tmp119__ |= (pSrc->tsid << 1); - tmp119__ |= (pSrc->direction << 5); - tmp119__ |= (pSrc->access_policy << 7); - tmp119__ |= (pSrc->aggregation << 9); - tmp119__ |= (pSrc->psb << 10); - tmp119__ |= (pSrc->user_priority << 11); - tmp119__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp119__, 0); + tmp117__ = 0U; + tmp117__ |= (pSrc->traffic_type << 0); + tmp117__ |= (pSrc->tsid << 1); + tmp117__ |= (pSrc->direction << 5); + tmp117__ |= (pSrc->access_policy << 7); + tmp117__ |= (pSrc->aggregation << 9); + tmp117__ |= (pSrc->psb << 10); + tmp117__ |= (pSrc->user_priority << 11); + tmp117__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp117__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp120__ = 0U; - tmp120__ |= (pSrc->tsinfo_rsvd << 0); - tmp120__ |= (pSrc->burst_size_defn << 7); - *pBuf = tmp120__; + tmp118__ = 0U; + tmp118__ |= (pSrc->tsinfo_rsvd << 0); + tmp118__ |= (pSrc->burst_size_defn << 7); + *pBuf = tmp118__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp121__ = 0U; - tmp121__ |= (pSrc->size << 0); - tmp121__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp121__, 0); + tmp119__ = 0U; + tmp119__ |= (pSrc->size << 0); + tmp119__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp119__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18795,8 +18690,8 @@ uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp122__; - uint8_t tmp123__; + uint8_t tmp120__; + uint8_t tmp121__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_rpt(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -18811,24 +18706,24 @@ uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp122__ = 0U; - tmp122__ |= (pSrc->APReachability << 0); - tmp122__ |= (pSrc->Security << 2); - tmp122__ |= (pSrc->KeyScope << 3); - tmp122__ |= (pSrc->SpecMgmtCap << 4); - tmp122__ |= (pSrc->QosCap << 5); - tmp122__ |= (pSrc->apsd << 6); - tmp122__ |= (pSrc->rrm << 7); - *pBuf = tmp122__; + tmp120__ = 0U; + tmp120__ |= (pSrc->APReachability << 0); + tmp120__ |= (pSrc->Security << 2); + tmp120__ |= (pSrc->KeyScope << 3); + tmp120__ |= (pSrc->SpecMgmtCap << 4); + tmp120__ |= (pSrc->QosCap << 5); + tmp120__ |= (pSrc->apsd << 6); + tmp120__ |= (pSrc->rrm << 7); + *pBuf = tmp120__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp123__ = 0U; - tmp123__ |= (pSrc->DelayedBA << 0); - tmp123__ |= (pSrc->ImmBA << 1); - tmp123__ |= (pSrc->MobilityDomain << 2); - tmp123__ |= (pSrc->reserved << 3); - *pBuf = tmp123__; + tmp121__ = 0U; + tmp121__ |= (pSrc->DelayedBA << 0); + tmp121__ |= (pSrc->ImmBA << 1); + tmp121__ |= (pSrc->MobilityDomain << 2); + tmp121__ |= (pSrc->reserved << 3); + *pBuf = tmp121__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19191,14 +19086,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 tmp122__; + uint8_t tmp123__; uint8_t tmp124__; uint8_t tmp125__; uint8_t tmp126__; uint8_t tmp127__; uint8_t tmp128__; uint8_t tmp129__; - uint8_t tmp130__; - uint8_t tmp131__; nNeeded += 18; while (pSrc->present) { if (nNeeded > nBuf) @@ -19213,76 +19108,76 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; - tmp124__ = 0U; - tmp124__ |= (pSrc->acbe_aifsn << 0); - tmp124__ |= (pSrc->acbe_acm << 4); - tmp124__ |= (pSrc->acbe_aci << 5); - tmp124__ |= (pSrc->unused1 << 7); - *pBuf = tmp124__; + tmp122__ = 0U; + tmp122__ |= (pSrc->acbe_aifsn << 0); + tmp122__ |= (pSrc->acbe_acm << 4); + tmp122__ |= (pSrc->acbe_aci << 5); + tmp122__ |= (pSrc->unused1 << 7); + *pBuf = tmp122__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp125__ = 0U; - tmp125__ |= (pSrc->acbe_acwmin << 0); - tmp125__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp125__; + tmp123__ = 0U; + tmp123__ |= (pSrc->acbe_acwmin << 0); + tmp123__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp123__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp126__ = 0U; - tmp126__ |= (pSrc->acbk_aifsn << 0); - tmp126__ |= (pSrc->acbk_acm << 4); - tmp126__ |= (pSrc->acbk_aci << 5); - tmp126__ |= (pSrc->unused2 << 7); - *pBuf = tmp126__; + tmp124__ = 0U; + tmp124__ |= (pSrc->acbk_aifsn << 0); + tmp124__ |= (pSrc->acbk_acm << 4); + tmp124__ |= (pSrc->acbk_aci << 5); + tmp124__ |= (pSrc->unused2 << 7); + *pBuf = tmp124__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp127__ = 0U; - tmp127__ |= (pSrc->acbk_acwmin << 0); - tmp127__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp127__; + tmp125__ = 0U; + tmp125__ |= (pSrc->acbk_acwmin << 0); + tmp125__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp125__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp128__ = 0U; - tmp128__ |= (pSrc->acvi_aifsn << 0); - tmp128__ |= (pSrc->acvi_acm << 4); - tmp128__ |= (pSrc->acvi_aci << 5); - tmp128__ |= (pSrc->unused3 << 7); - *pBuf = tmp128__; + tmp126__ = 0U; + tmp126__ |= (pSrc->acvi_aifsn << 0); + tmp126__ |= (pSrc->acvi_acm << 4); + tmp126__ |= (pSrc->acvi_aci << 5); + tmp126__ |= (pSrc->unused3 << 7); + *pBuf = tmp126__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp129__ = 0U; - tmp129__ |= (pSrc->acvi_acwmin << 0); - tmp129__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp129__; + tmp127__ = 0U; + tmp127__ |= (pSrc->acvi_acwmin << 0); + tmp127__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp127__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp130__ = 0U; - tmp130__ |= (pSrc->acvo_aifsn << 0); - tmp130__ |= (pSrc->acvo_acm << 4); - tmp130__ |= (pSrc->acvo_aci << 5); - tmp130__ |= (pSrc->unused4 << 7); - *pBuf = tmp130__; + tmp128__ = 0U; + tmp128__ |= (pSrc->acvo_aifsn << 0); + tmp128__ |= (pSrc->acvo_acm << 4); + tmp128__ |= (pSrc->acvo_aci << 5); + tmp128__ |= (pSrc->unused4 << 7); + *pBuf = tmp128__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp131__ = 0U; - tmp131__ |= (pSrc->acvo_acwmin << 0); - tmp131__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp131__; + tmp129__ = 0U; + tmp129__ |= (pSrc->acvo_acwmin << 0); + tmp129__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp129__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19307,7 +19202,7 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp132__; + uint8_t tmp130__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -19316,12 +19211,12 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp132__ = 0U; - tmp132__ |= (pSrc->non_erp_present << 0); - tmp132__ |= (pSrc->use_prot << 1); - tmp132__ |= (pSrc->barker_preamble << 2); - tmp132__ |= (pSrc->unused << 3); - *pBuf = tmp132__; + tmp130__ = 0U; + tmp130__ |= (pSrc->non_erp_present << 0); + tmp130__ |= (pSrc->use_prot << 1); + tmp130__ |= (pSrc->barker_preamble << 2); + tmp130__ |= (pSrc->unused << 3); + *pBuf = tmp130__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -19380,7 +19275,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 tmp133__; + uint8_t tmp131__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -19400,10 +19295,10 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, *pBuf = pSrc->mgmt_state; *pnConsumed += 1; pBuf += 1; - tmp133__ = 0U; - tmp133__ |= (pSrc->mbssid_mask << 0); - tmp133__ |= (pSrc->reserved << 3); - *pBuf = tmp133__; + tmp131__ = 0U; + tmp131__ |= (pSrc->mbssid_mask << 0); + tmp131__ |= (pSrc->reserved << 3); + *pBuf = tmp131__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -19754,7 +19649,7 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp134__; + uint16_t tmp132__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ieft_info(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -19766,10 +19661,10 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; --nBuf; ++(*pnConsumed); - tmp134__ = 0U; - tmp134__ |= (pSrc->reserved << 0); - tmp134__ |= (pSrc->IECount << 8); - frameshtons(pCtx, pBuf, tmp134__, 0); + tmp132__ = 0U; + tmp132__ |= (pSrc->reserved << 0); + tmp132__ |= (pSrc->IECount << 8); + frameshtons(pCtx, pBuf, tmp132__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -19807,11 +19702,11 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint16_t tmp133__; + uint8_t tmp134__; uint16_t tmp135__; - uint8_t tmp136__; - uint16_t tmp137__; - uint32_t tmp138__; - uint8_t tmp139__; + uint32_t tmp136__; + uint8_t tmp137__; nNeeded += (pSrc->num_rsvd + 26); while (pSrc->present) { if (nNeeded > nBuf) @@ -19820,77 +19715,77 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp135__ = 0U; - tmp135__ |= (pSrc->advCodingCap << 0); - tmp135__ |= (pSrc->supportedChannelWidthSet << 1); - tmp135__ |= (pSrc->mimoPowerSave << 2); - tmp135__ |= (pSrc->greenField << 4); - tmp135__ |= (pSrc->shortGI20MHz << 5); - tmp135__ |= (pSrc->shortGI40MHz << 6); - tmp135__ |= (pSrc->txSTBC << 7); - tmp135__ |= (pSrc->rxSTBC << 8); - tmp135__ |= (pSrc->delayedBA << 10); - tmp135__ |= (pSrc->maximalAMSDUsize << 11); - tmp135__ |= (pSrc->dsssCckMode40MHz << 12); - tmp135__ |= (pSrc->psmp << 13); - tmp135__ |= (pSrc->stbcControlFrame << 14); - tmp135__ |= (pSrc->lsigTXOPProtection << 15); - frameshtons(pCtx, pBuf, tmp135__, 0); + tmp133__ = 0U; + tmp133__ |= (pSrc->advCodingCap << 0); + tmp133__ |= (pSrc->supportedChannelWidthSet << 1); + tmp133__ |= (pSrc->mimoPowerSave << 2); + tmp133__ |= (pSrc->greenField << 4); + tmp133__ |= (pSrc->shortGI20MHz << 5); + tmp133__ |= (pSrc->shortGI40MHz << 6); + tmp133__ |= (pSrc->txSTBC << 7); + tmp133__ |= (pSrc->rxSTBC << 8); + tmp133__ |= (pSrc->delayedBA << 10); + tmp133__ |= (pSrc->maximalAMSDUsize << 11); + tmp133__ |= (pSrc->dsssCckMode40MHz << 12); + tmp133__ |= (pSrc->psmp << 13); + tmp133__ |= (pSrc->stbcControlFrame << 14); + tmp133__ |= (pSrc->lsigTXOPProtection << 15); + frameshtons(pCtx, pBuf, tmp133__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp136__ = 0U; - tmp136__ |= (pSrc->maxRxAMPDUFactor << 0); - tmp136__ |= (pSrc->mpduDensity << 2); - tmp136__ |= (pSrc->reserved1 << 5); - *pBuf = tmp136__; + tmp134__ = 0U; + tmp134__ |= (pSrc->maxRxAMPDUFactor << 0); + tmp134__ |= (pSrc->mpduDensity << 2); + tmp134__ |= (pSrc->reserved1 << 5); + *pBuf = tmp134__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16); *pnConsumed += 16; pBuf += 16; - tmp137__ = 0U; - tmp137__ |= (pSrc->pco << 0); - tmp137__ |= (pSrc->transitionTime << 1); - tmp137__ |= (pSrc->reserved2 << 3); - tmp137__ |= (pSrc->mcsFeedback << 8); - tmp137__ |= (pSrc->reserved3 << 10); - frameshtons(pCtx, pBuf, tmp137__, 0); + tmp135__ = 0U; + tmp135__ |= (pSrc->pco << 0); + tmp135__ |= (pSrc->transitionTime << 1); + tmp135__ |= (pSrc->reserved2 << 3); + tmp135__ |= (pSrc->mcsFeedback << 8); + tmp135__ |= (pSrc->reserved3 << 10); + frameshtons(pCtx, pBuf, tmp135__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp138__ = 0U; - tmp138__ |= (pSrc->txBF << 0); - tmp138__ |= (pSrc->rxStaggeredSounding << 1); - tmp138__ |= (pSrc->txStaggeredSounding << 2); - tmp138__ |= (pSrc->rxZLF << 3); - tmp138__ |= (pSrc->txZLF << 4); - tmp138__ |= (pSrc->implicitTxBF << 5); - tmp138__ |= (pSrc->calibration << 6); - tmp138__ |= (pSrc->explicitCSITxBF << 8); - tmp138__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); - tmp138__ |= (pSrc->explicitBFCSIFeedback << 10); - tmp138__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); - tmp138__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); - tmp138__ |= (pSrc->csiNumBFAntennae << 19); - tmp138__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); - tmp138__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); - tmp138__ |= (pSrc->reserved4 << 25); - frameshtonl(pCtx, pBuf, tmp138__, 0); + tmp136__ = 0U; + tmp136__ |= (pSrc->txBF << 0); + tmp136__ |= (pSrc->rxStaggeredSounding << 1); + tmp136__ |= (pSrc->txStaggeredSounding << 2); + tmp136__ |= (pSrc->rxZLF << 3); + tmp136__ |= (pSrc->txZLF << 4); + tmp136__ |= (pSrc->implicitTxBF << 5); + tmp136__ |= (pSrc->calibration << 6); + tmp136__ |= (pSrc->explicitCSITxBF << 8); + tmp136__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); + tmp136__ |= (pSrc->explicitBFCSIFeedback << 10); + tmp136__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); + tmp136__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); + tmp136__ |= (pSrc->csiNumBFAntennae << 19); + tmp136__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); + tmp136__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); + tmp136__ |= (pSrc->reserved4 << 25); + frameshtonl(pCtx, pBuf, tmp136__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp139__ = 0U; - tmp139__ |= (pSrc->antennaSelection << 0); - tmp139__ |= (pSrc->explicitCSIFeedbackTx << 1); - tmp139__ |= (pSrc->antennaIndicesFeedbackTx << 2); - tmp139__ |= (pSrc->explicitCSIFeedback << 3); - tmp139__ |= (pSrc->antennaIndicesFeedback << 4); - tmp139__ |= (pSrc->rxAS << 5); - tmp139__ |= (pSrc->txSoundingPPDUs << 6); - tmp139__ |= (pSrc->reserved5 << 7); - *pBuf = tmp139__; + tmp137__ = 0U; + tmp137__ |= (pSrc->antennaSelection << 0); + tmp137__ |= (pSrc->explicitCSIFeedbackTx << 1); + tmp137__ |= (pSrc->antennaIndicesFeedbackTx << 2); + tmp137__ |= (pSrc->explicitCSIFeedback << 3); + tmp137__ |= (pSrc->antennaIndicesFeedback << 4); + tmp137__ |= (pSrc->rxAS << 5); + tmp137__ |= (pSrc->txSoundingPPDUs << 6); + tmp137__ |= (pSrc->reserved5 << 7); + *pBuf = tmp137__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19915,9 +19810,9 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp140__; - uint16_t tmp141__; - uint16_t tmp142__; + uint8_t tmp138__; + uint16_t tmp139__; + uint16_t tmp140__; nNeeded += (pSrc->num_rsvd + 22); while (pSrc->present) { if (nNeeded > nBuf) @@ -19929,35 +19824,35 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, *pBuf = pSrc->primaryChannel; *pnConsumed += 1; pBuf += 1; - tmp140__ = 0U; - tmp140__ |= (pSrc->secondaryChannelOffset << 0); - tmp140__ |= (pSrc->recommendedTxWidthSet << 2); - tmp140__ |= (pSrc->rifsMode << 3); - tmp140__ |= (pSrc->controlledAccessOnly << 4); - tmp140__ |= (pSrc->serviceIntervalGranularity << 5); - *pBuf = tmp140__; + tmp138__ = 0U; + tmp138__ |= (pSrc->secondaryChannelOffset << 0); + tmp138__ |= (pSrc->recommendedTxWidthSet << 2); + tmp138__ |= (pSrc->rifsMode << 3); + tmp138__ |= (pSrc->controlledAccessOnly << 4); + tmp138__ |= (pSrc->serviceIntervalGranularity << 5); + *pBuf = tmp138__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp141__ = 0U; - tmp141__ |= (pSrc->opMode << 0); - tmp141__ |= (pSrc->nonGFDevicesPresent << 2); - tmp141__ |= (pSrc->transmitBurstLimit << 3); - tmp141__ |= (pSrc->obssNonHTStaPresent << 4); - tmp141__ |= (pSrc->reserved << 5); - frameshtons(pCtx, pBuf, tmp141__, 0); + tmp139__ = 0U; + tmp139__ |= (pSrc->opMode << 0); + tmp139__ |= (pSrc->nonGFDevicesPresent << 2); + tmp139__ |= (pSrc->transmitBurstLimit << 3); + tmp139__ |= (pSrc->obssNonHTStaPresent << 4); + tmp139__ |= (pSrc->reserved << 5); + frameshtons(pCtx, pBuf, tmp139__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp142__ = 0U; - tmp142__ |= (pSrc->basicSTBCMCS << 0); - tmp142__ |= (pSrc->dualCTSProtection << 7); - tmp142__ |= (pSrc->secondaryBeacon << 8); - tmp142__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); - tmp142__ |= (pSrc->pcoActive << 10); - tmp142__ |= (pSrc->pcoPhase << 11); - tmp142__ |= (pSrc->reserved2 << 12); - frameshtons(pCtx, pBuf, tmp142__, 0); + tmp140__ = 0U; + tmp140__ |= (pSrc->basicSTBCMCS << 0); + tmp140__ |= (pSrc->dualCTSProtection << 7); + tmp140__ |= (pSrc->secondaryBeacon << 8); + tmp140__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); + tmp140__ |= (pSrc->pcoActive << 10); + tmp140__ |= (pSrc->pcoPhase << 11); + tmp140__ |= (pSrc->reserved2 << 12); + frameshtons(pCtx, pBuf, tmp140__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -20097,9 +19992,9 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint8_t tmp141__; + uint8_t tmp142__; uint8_t tmp143__; - uint8_t tmp144__; - uint8_t tmp145__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20114,12 +20009,12 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, *pBuf = pSrc->token; *pnConsumed += 1; pBuf += 1; - tmp143__ = 0U; - tmp143__ |= (pSrc->late << 0); - tmp143__ |= (pSrc->incapable << 1); - tmp143__ |= (pSrc->refused << 2); - tmp143__ |= (pSrc->unused << 3); - *pBuf = tmp143__; + tmp141__ = 0U; + tmp141__ |= (pSrc->late << 0); + tmp141__ |= (pSrc->incapable << 1); + tmp141__ |= (pSrc->refused << 2); + tmp141__ |= (pSrc->unused << 3); + *pBuf = tmp141__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20138,14 +20033,14 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp144__ = 0U; - tmp144__ |= (pSrc->report.Basic.bss << 0); - tmp144__ |= (pSrc->report.Basic.ofdm_preamble << 1); - tmp144__ |= (pSrc->report.Basic.unid_signal << 2); - tmp144__ |= (pSrc->report.Basic.rader << 3); - tmp144__ |= (pSrc->report.Basic.unmeasured << 4); - tmp144__ |= (pSrc->report.Basic.unused << 5); - *pBuf = tmp144__; + tmp142__ = 0U; + tmp142__ |= (pSrc->report.Basic.bss << 0); + tmp142__ |= (pSrc->report.Basic.ofdm_preamble << 1); + tmp142__ |= (pSrc->report.Basic.unid_signal << 2); + tmp142__ |= (pSrc->report.Basic.rader << 3); + tmp142__ |= (pSrc->report.Basic.unmeasured << 4); + tmp142__ |= (pSrc->report.Basic.unused << 5); + *pBuf = tmp142__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20212,10 +20107,10 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp145__ = 0U; - tmp145__ |= (pSrc->report.Beacon.condensed_PHY << 0); - tmp145__ |= (pSrc->report.Beacon.reported_frame_type << 7); - *pBuf = tmp145__; + tmp143__ = 0U; + tmp143__ |= (pSrc->report.Beacon.condensed_PHY << 0); + tmp143__ |= (pSrc->report.Beacon.reported_frame_type << 7); + *pBuf = tmp143__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20264,7 +20159,7 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp146__; + uint8_t tmp144__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_request(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20279,14 +20174,14 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, *pBuf = pSrc->measurement_token; *pnConsumed += 1; pBuf += 1; - tmp146__ = 0U; - tmp146__ |= (pSrc->parallel << 0); - tmp146__ |= (pSrc->enable << 1); - tmp146__ |= (pSrc->request << 2); - tmp146__ |= (pSrc->report << 3); - tmp146__ |= (pSrc->durationMandatory << 4); - tmp146__ |= (pSrc->unused << 5); - *pBuf = tmp146__; + tmp144__ = 0U; + tmp144__ |= (pSrc->parallel << 0); + tmp144__ |= (pSrc->enable << 1); + tmp144__ |= (pSrc->request << 2); + tmp144__ |= (pSrc->report << 3); + tmp144__ |= (pSrc->durationMandatory << 4); + tmp144__ |= (pSrc->unused << 5); + *pBuf = tmp144__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20400,7 +20295,7 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp147__; + uint8_t tmp145__; nNeeded += 3; while (pSrc->present) { if (nNeeded > nBuf) @@ -20412,11 +20307,11 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->MDID, 0); *pnConsumed += 2; pBuf += 2; - tmp147__ = 0U; - tmp147__ |= (pSrc->overDSCap << 0); - tmp147__ |= (pSrc->resourceReqCap << 1); - tmp147__ |= (pSrc->reserved << 2); - *pBuf = tmp147__; + tmp145__ = 0U; + tmp145__ |= (pSrc->overDSCap << 0); + tmp145__ |= (pSrc->resourceReqCap << 1); + tmp145__ |= (pSrc->reserved << 2); + *pBuf = tmp145__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20438,8 +20333,8 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp148__; - uint8_t tmp149__; + uint8_t tmp146__; + uint8_t tmp147__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20454,24 +20349,24 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp148__ = 0U; - tmp148__ |= (pSrc->APReachability << 0); - tmp148__ |= (pSrc->Security << 2); - tmp148__ |= (pSrc->KeyScope << 3); - tmp148__ |= (pSrc->SpecMgmtCap << 4); - tmp148__ |= (pSrc->QosCap << 5); - tmp148__ |= (pSrc->apsd << 6); - tmp148__ |= (pSrc->rrm << 7); - *pBuf = tmp148__; + tmp146__ = 0U; + tmp146__ |= (pSrc->APReachability << 0); + tmp146__ |= (pSrc->Security << 2); + tmp146__ |= (pSrc->KeyScope << 3); + tmp146__ |= (pSrc->SpecMgmtCap << 4); + tmp146__ |= (pSrc->QosCap << 5); + tmp146__ |= (pSrc->apsd << 6); + tmp146__ |= (pSrc->rrm << 7); + *pBuf = tmp146__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp149__ = 0U; - tmp149__ |= (pSrc->DelayedBA << 0); - tmp149__ |= (pSrc->ImmBA << 1); - tmp149__ |= (pSrc->MobilityDomain << 2); - tmp149__ |= (pSrc->reserved << 3); - *pBuf = tmp149__; + tmp147__ = 0U; + tmp147__ |= (pSrc->DelayedBA << 0); + tmp147__ |= (pSrc->ImmBA << 1); + tmp147__ |= (pSrc->MobilityDomain << 2); + tmp147__ |= (pSrc->reserved << 3); + *pBuf = tmp147__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20559,7 +20454,7 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp150__; + uint8_t tmp148__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -20568,12 +20463,12 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp150__ = 0U; - tmp150__ |= (pSrc->chanWidth << 0); - tmp150__ |= (pSrc->reserved << 2); - tmp150__ |= (pSrc->rxNSS << 4); - tmp150__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp150__; + tmp148__ = 0U; + tmp148__ |= (pSrc->chanWidth << 0); + tmp148__ |= (pSrc->reserved << 2); + tmp148__ |= (pSrc->rxNSS << 4); + tmp148__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp148__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21048,7 +20943,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 tmp151__; + uint8_t tmp149__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -21057,13 +20952,13 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp151__ = 0U; - tmp151__ |= (pSrc->ac_bk_traffic_aval << 0); - tmp151__ |= (pSrc->ac_be_traffic_aval << 1); - tmp151__ |= (pSrc->ac_vi_traffic_aval << 2); - tmp151__ |= (pSrc->ac_vo_traffic_aval << 3); - tmp151__ |= (pSrc->reserved << 4); - *pBuf = tmp151__; + tmp149__ = 0U; + tmp149__ |= (pSrc->ac_bk_traffic_aval << 0); + tmp149__ |= (pSrc->ac_be_traffic_aval << 1); + tmp149__ |= (pSrc->ac_vi_traffic_aval << 2); + tmp149__ |= (pSrc->ac_vo_traffic_aval << 3); + tmp149__ |= (pSrc->reserved << 4); + *pBuf = tmp149__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21256,7 +21151,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 tmp152__; + uint8_t tmp150__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -21265,13 +21160,13 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp152__ = 0U; - tmp152__ |= (pSrc->count << 0); - tmp152__ |= (pSrc->qack << 4); - tmp152__ |= (pSrc->qreq << 5); - tmp152__ |= (pSrc->txopreq << 6); - tmp152__ |= (pSrc->reserved << 7); - *pBuf = tmp152__; + tmp150__ = 0U; + tmp150__ |= (pSrc->count << 0); + tmp150__ |= (pSrc->qack << 4); + tmp150__ |= (pSrc->qreq << 5); + tmp150__ |= (pSrc->txopreq << 6); + tmp150__ |= (pSrc->reserved << 7); + *pBuf = tmp150__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21293,7 +21188,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 tmp153__; + uint8_t tmp151__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -21302,15 +21197,15 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp153__ = 0U; - tmp153__ |= (pSrc->acvo_uapsd << 0); - tmp153__ |= (pSrc->acvi_uapsd << 1); - tmp153__ |= (pSrc->acbk_uapsd << 2); - tmp153__ |= (pSrc->acbe_uapsd << 3); - tmp153__ |= (pSrc->qack << 4); - tmp153__ |= (pSrc->max_sp_length << 5); - tmp153__ |= (pSrc->more_data_ack << 7); - *pBuf = tmp153__; + tmp151__ = 0U; + tmp151__ |= (pSrc->acvo_uapsd << 0); + tmp151__ |= (pSrc->acvi_uapsd << 1); + tmp151__ |= (pSrc->acbk_uapsd << 2); + tmp151__ |= (pSrc->acbe_uapsd << 3); + tmp151__ |= (pSrc->qack << 4); + tmp151__ |= (pSrc->max_sp_length << 5); + tmp151__ |= (pSrc->more_data_ack << 7); + *pBuf = tmp151__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21945,7 +21840,7 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp154__; + uint16_t tmp152__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_iewapi(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -21975,10 +21870,10 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4); *pnConsumed += 4; pBuf += 4; - tmp154__ = 0U; - tmp154__ |= (pSrc->preauth << 0); - tmp154__ |= (pSrc->reserved << 1); - frameshtons(pCtx, pBuf, tmp154__, 0); + tmp152__ = 0U; + tmp152__ |= (pSrc->preauth << 0); + tmp152__ |= (pSrc->reserved << 1); + frameshtons(pCtx, pBuf, tmp152__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -22118,7 +22013,7 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp155__; + uint8_t tmp153__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22140,13 +22035,13 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp155__ = 0U; - tmp155__ |= (pSrc->reserved << 0); - tmp155__ |= (pSrc->qack << 4); - tmp155__ |= (pSrc->queue_request << 5); - tmp155__ |= (pSrc->txop_request << 6); - tmp155__ |= (pSrc->more_ack << 7); - *pBuf = tmp155__; + tmp153__ = 0U; + tmp153__ |= (pSrc->reserved << 0); + tmp153__ |= (pSrc->qack << 4); + tmp153__ |= (pSrc->queue_request << 5); + tmp153__ |= (pSrc->txop_request << 6); + tmp153__ |= (pSrc->more_ack << 7); + *pBuf = tmp153__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -22168,7 +22063,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 tmp156__; + uint8_t tmp154__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22190,11 +22085,11 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp156__ = 0U; - tmp156__ |= (pSrc->param_set_count << 0); - tmp156__ |= (pSrc->reserved << 4); - tmp156__ |= (pSrc->uapsd << 7); - *pBuf = tmp156__; + tmp154__ = 0U; + tmp154__ |= (pSrc->param_set_count << 0); + tmp154__ |= (pSrc->reserved << 4); + tmp154__ |= (pSrc->uapsd << 7); + *pBuf = tmp154__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -22216,7 +22111,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 tmp157__; + uint8_t tmp155__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22238,15 +22133,15 @@ uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp157__ = 0U; - tmp157__ |= (pSrc->acvo_uapsd << 0); - tmp157__ |= (pSrc->acvi_uapsd << 1); - tmp157__ |= (pSrc->acbk_uapsd << 2); - tmp157__ |= (pSrc->acbe_uapsd << 3); - tmp157__ |= (pSrc->reserved1 << 4); - tmp157__ |= (pSrc->max_sp_length << 5); - tmp157__ |= (pSrc->reserved2 << 7); - *pBuf = tmp157__; + tmp155__ = 0U; + tmp155__ |= (pSrc->acvo_uapsd << 0); + tmp155__ |= (pSrc->acvi_uapsd << 1); + tmp155__ |= (pSrc->acbk_uapsd << 2); + tmp155__ |= (pSrc->acbe_uapsd << 3); + tmp155__ |= (pSrc->reserved1 << 4); + tmp155__ |= (pSrc->max_sp_length << 5); + tmp155__ |= (pSrc->reserved2 << 7); + *pBuf = tmp155__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -22268,14 +22163,14 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint8_t tmp156__; + uint8_t tmp157__; uint8_t tmp158__; uint8_t tmp159__; uint8_t tmp160__; uint8_t tmp161__; uint8_t tmp162__; uint8_t tmp163__; - uint8_t tmp164__; - uint8_t tmp165__; nNeeded += 19; while (pSrc->present) { if (nNeeded > nBuf) @@ -22303,76 +22198,76 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved2; *pnConsumed += 1; pBuf += 1; - tmp158__ = 0U; - tmp158__ |= (pSrc->acbe_aifsn << 0); - tmp158__ |= (pSrc->acbe_acm << 4); - tmp158__ |= (pSrc->acbe_aci << 5); - tmp158__ |= (pSrc->unused1 << 7); - *pBuf = tmp158__; + tmp156__ = 0U; + tmp156__ |= (pSrc->acbe_aifsn << 0); + tmp156__ |= (pSrc->acbe_acm << 4); + tmp156__ |= (pSrc->acbe_aci << 5); + tmp156__ |= (pSrc->unused1 << 7); + *pBuf = tmp156__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp159__ = 0U; - tmp159__ |= (pSrc->acbe_acwmin << 0); - tmp159__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp159__; + tmp157__ = 0U; + tmp157__ |= (pSrc->acbe_acwmin << 0); + tmp157__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp157__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp160__ = 0U; - tmp160__ |= (pSrc->acbk_aifsn << 0); - tmp160__ |= (pSrc->acbk_acm << 4); - tmp160__ |= (pSrc->acbk_aci << 5); - tmp160__ |= (pSrc->unused2 << 7); - *pBuf = tmp160__; + tmp158__ = 0U; + tmp158__ |= (pSrc->acbk_aifsn << 0); + tmp158__ |= (pSrc->acbk_acm << 4); + tmp158__ |= (pSrc->acbk_aci << 5); + tmp158__ |= (pSrc->unused2 << 7); + *pBuf = tmp158__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp161__ = 0U; - tmp161__ |= (pSrc->acbk_acwmin << 0); - tmp161__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp161__; + tmp159__ = 0U; + tmp159__ |= (pSrc->acbk_acwmin << 0); + tmp159__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp159__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp162__ = 0U; - tmp162__ |= (pSrc->acvi_aifsn << 0); - tmp162__ |= (pSrc->acvi_acm << 4); - tmp162__ |= (pSrc->acvi_aci << 5); - tmp162__ |= (pSrc->unused3 << 7); - *pBuf = tmp162__; + tmp160__ = 0U; + tmp160__ |= (pSrc->acvi_aifsn << 0); + tmp160__ |= (pSrc->acvi_acm << 4); + tmp160__ |= (pSrc->acvi_aci << 5); + tmp160__ |= (pSrc->unused3 << 7); + *pBuf = tmp160__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp163__ = 0U; - tmp163__ |= (pSrc->acvi_acwmin << 0); - tmp163__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp163__; + tmp161__ = 0U; + tmp161__ |= (pSrc->acvi_acwmin << 0); + tmp161__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp161__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp164__ = 0U; - tmp164__ |= (pSrc->acvo_aifsn << 0); - tmp164__ |= (pSrc->acvo_acm << 4); - tmp164__ |= (pSrc->acvo_aci << 5); - tmp164__ |= (pSrc->unused4 << 7); - *pBuf = tmp164__; + tmp162__ = 0U; + tmp162__ |= (pSrc->acvo_aifsn << 0); + tmp162__ |= (pSrc->acvo_acm << 4); + tmp162__ |= (pSrc->acvo_aci << 5); + tmp162__ |= (pSrc->unused4 << 7); + *pBuf = tmp162__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp165__ = 0U; - tmp165__ |= (pSrc->acvo_acwmin << 0); - tmp165__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp165__; + tmp163__ = 0U; + tmp163__ |= (pSrc->acvo_acwmin << 0); + tmp163__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp163__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -22929,7 +22824,7 @@ uint32_t dot11f_pack_ie_bss_color_change(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp166__; + uint8_t tmp164__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22949,10 +22844,10 @@ uint32_t dot11f_pack_ie_bss_color_change(tpAniSirGlobal pCtx, *pBuf = pSrc->countdown; *pnConsumed += 1; pBuf += 1; - tmp166__ = 0U; - tmp166__ |= (pSrc->new_color << 0); - tmp166__ |= (pSrc->reserved << 6); - *pBuf = tmp166__; + tmp164__ = 0U; + tmp164__ |= (pSrc->new_color << 0); + tmp164__ |= (pSrc->reserved << 6); + *pBuf = tmp164__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -23145,7 +23040,7 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp167__; + uint16_t tmp165__; nNeeded += (pSrc->num_variable_data + 2); while (pSrc->present) { if (nNeeded > nBuf) @@ -23154,17 +23049,17 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp167__ = 0U; - tmp167__ |= (pSrc->public_key_identifiers_cnt << 0); - tmp167__ |= (pSrc->realm_identifiers_cnt << 3); - tmp167__ |= (pSrc->is_ip_config_supported << 6); - tmp167__ |= (pSrc->is_cache_id_present << 7); - tmp167__ |= (pSrc->is_hessid_present << 8); - tmp167__ |= (pSrc->is_fils_sk_auth_supported << 9); - tmp167__ |= (pSrc->is_fils_sk_auth_pfs_supported << 10); - tmp167__ |= (pSrc->is_pk_auth_supported << 11); - tmp167__ |= (pSrc->reserved << 12); - frameshtons(pCtx, pBuf, tmp167__, 0); + tmp165__ = 0U; + tmp165__ |= (pSrc->public_key_identifiers_cnt << 0); + tmp165__ |= (pSrc->realm_identifiers_cnt << 3); + tmp165__ |= (pSrc->is_ip_config_supported << 6); + tmp165__ |= (pSrc->is_cache_id_present << 7); + tmp165__ |= (pSrc->is_hessid_present << 8); + tmp165__ |= (pSrc->is_fils_sk_auth_supported << 9); + tmp165__ |= (pSrc->is_fils_sk_auth_pfs_supported << 10); + tmp165__ |= (pSrc->is_pk_auth_supported << 11); + tmp165__ |= (pSrc->reserved << 12); + frameshtons(pCtx, pBuf, tmp165__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -23410,11 +23305,11 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint32_t tmp166__; + uint8_t tmp167__; uint32_t tmp168__; - uint8_t tmp169__; - uint32_t tmp170__; - uint32_t tmp171__; - uint8_t tmp172__; + uint32_t tmp169__; + uint8_t tmp170__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_cap(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23423,111 +23318,111 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; *pBuf = 255; - ++pBuf; --nBuf; ++(*pnConsumed); + ++pBuf; ++(*pnConsumed); pIeLen = pBuf; - ++pBuf; --nBuf; ++(*pnConsumed); + ++pBuf; ++(*pnConsumed); *pBuf = 35; - ++pBuf; --nBuf; ++(*pnConsumed); + ++pBuf; ++(*pnConsumed); + tmp166__ = 0U; + tmp166__ |= (pSrc->htc_he << 0); + tmp166__ |= (pSrc->twt_request << 1); + tmp166__ |= (pSrc->twt_responder << 2); + tmp166__ |= (pSrc->fragmentation << 3); + tmp166__ |= (pSrc->max_num_frag_msdu << 5); + tmp166__ |= (pSrc->min_frag_size << 8); + tmp166__ |= (pSrc->trigger_frm_mac_pad << 10); + tmp166__ |= (pSrc->multi_tid_aggr << 12); + tmp166__ |= (pSrc->he_link_adaptation << 15); + tmp166__ |= (pSrc->all_ack << 17); + tmp166__ |= (pSrc->ul_mu_rsp_sched << 18); + tmp166__ |= (pSrc->a_bsr << 19); + tmp166__ |= (pSrc->broadcast_twt << 20); + tmp166__ |= (pSrc->ba_32bit_bitmap << 21); + tmp166__ |= (pSrc->mu_cascade << 22); + tmp166__ |= (pSrc->ack_enabled_multitid << 23); + tmp166__ |= (pSrc->dl_mu_ba << 24); + tmp166__ |= (pSrc->omi_a_ctrl << 25); + tmp166__ |= (pSrc->ofdma_ra << 26); + tmp166__ |= (pSrc->max_ampdu_len << 27); + tmp166__ |= (pSrc->amsdu_frag << 29); + tmp166__ |= (pSrc->flex_twt_sched << 30); + tmp166__ |= (pSrc->rx_ctrl_frame << 31); + frameshtonl(pCtx, pBuf, tmp166__, 0); + *pnConsumed += 4; + pBuf += 4; + nBuf -= 4 ; + tmp167__ = 0U; + tmp167__ |= (pSrc->bsrp_ampdu_aggr << 0); + tmp167__ |= (pSrc->qtp << 1); + tmp167__ |= (pSrc->a_bqr << 2); + tmp167__ |= (pSrc->sr_responder << 3); + tmp167__ |= (pSrc->ndp_feedback_supp << 4); + tmp167__ |= (pSrc->ops_supp << 5); + tmp167__ |= (pSrc->amsdu_in_ampdu << 6); + tmp167__ |= (pSrc->reserved1 << 7); + *pBuf = tmp167__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; tmp168__ = 0U; - tmp168__ |= (pSrc->htc_he << 0); - tmp168__ |= (pSrc->twt_request << 1); - tmp168__ |= (pSrc->twt_responder << 2); - tmp168__ |= (pSrc->fragmentation << 3); - tmp168__ |= (pSrc->max_num_frag_msdu << 5); - tmp168__ |= (pSrc->min_frag_size << 8); - tmp168__ |= (pSrc->trigger_frm_mac_pad << 10); - tmp168__ |= (pSrc->multi_tid_aggr << 12); - tmp168__ |= (pSrc->he_link_adaptation << 15); - tmp168__ |= (pSrc->all_ack << 17); - tmp168__ |= (pSrc->ul_mu_rsp_sched << 18); - tmp168__ |= (pSrc->a_bsr << 19); - tmp168__ |= (pSrc->broadcast_twt << 20); - tmp168__ |= (pSrc->ba_32bit_bitmap << 21); - tmp168__ |= (pSrc->mu_cascade << 22); - tmp168__ |= (pSrc->ack_enabled_multitid << 23); - tmp168__ |= (pSrc->dl_mu_ba << 24); - tmp168__ |= (pSrc->omi_a_ctrl << 25); - tmp168__ |= (pSrc->ofdma_ra << 26); - tmp168__ |= (pSrc->max_ampdu_len << 27); - tmp168__ |= (pSrc->amsdu_frag << 29); - tmp168__ |= (pSrc->flex_twt_sched << 30); - tmp168__ |= (pSrc->rx_ctrl_frame << 31); + tmp168__ |= (pSrc->dual_band << 0); + tmp168__ |= (pSrc->chan_width_0 << 1); + tmp168__ |= (pSrc->chan_width_1 << 2); + tmp168__ |= (pSrc->chan_width_2 << 3); + tmp168__ |= (pSrc->chan_width_3 << 4); + tmp168__ |= (pSrc->chan_width_4 << 5); + tmp168__ |= (pSrc->chan_width_5 << 6); + tmp168__ |= (pSrc->chan_width_6 << 7); + tmp168__ |= (pSrc->rx_pream_puncturing << 8); + tmp168__ |= (pSrc->device_class << 12); + tmp168__ |= (pSrc->ldpc_coding << 13); + tmp168__ |= (pSrc->he_1x_ltf_800_gi_ppdu << 14); + tmp168__ |= (pSrc->midamble_rx_max_nsts << 15); + tmp168__ |= (pSrc->he_4x_ltf_3200_gi_ndp << 17); + tmp168__ |= (pSrc->stbc_lt_80mhz << 18); + tmp168__ |= (pSrc->doppler << 20); + tmp168__ |= (pSrc->ul_mu << 22); + tmp168__ |= (pSrc->dcm_enc_tx << 24); + tmp168__ |= (pSrc->dcm_enc_rx << 27); + tmp168__ |= (pSrc->ul_he_mu << 30); + tmp168__ |= (pSrc->su_beamformer << 31); frameshtonl(pCtx, pBuf, tmp168__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; tmp169__ = 0U; - tmp169__ |= (pSrc->bsrp_ampdu_aggr << 0); - tmp169__ |= (pSrc->qtp << 1); - tmp169__ |= (pSrc->a_bqr << 2); - tmp169__ |= (pSrc->sr_responder << 3); - tmp169__ |= (pSrc->ndp_feedback_supp << 4); - tmp169__ |= (pSrc->ops_supp << 5); - tmp169__ |= (pSrc->amsdu_in_ampdu << 6); - tmp169__ |= (pSrc->reserved1 << 7); - *pBuf = tmp169__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; + tmp169__ |= (pSrc->su_beamformee << 0); + tmp169__ |= (pSrc->mu_beamformer << 1); + tmp169__ |= (pSrc->bfee_sts_lt_80 << 2); + tmp169__ |= (pSrc->bfee_sts_gt_80 << 5); + tmp169__ |= (pSrc->num_sounding_lt_80 << 8); + tmp169__ |= (pSrc->num_sounding_gt_80 << 11); + tmp169__ |= (pSrc->su_feedback_tone16 << 14); + tmp169__ |= (pSrc->mu_feedback_tone16 << 15); + tmp169__ |= (pSrc->codebook_su << 16); + tmp169__ |= (pSrc->codebook_mu << 17); + tmp169__ |= (pSrc->beamforming_feedback << 18); + tmp169__ |= (pSrc->he_er_su_ppdu << 21); + tmp169__ |= (pSrc->dl_mu_mimo_part_bw << 22); + tmp169__ |= (pSrc->ppet_present << 23); + tmp169__ |= (pSrc->srp << 24); + tmp169__ |= (pSrc->power_boost << 25); + tmp169__ |= (pSrc->he_ltf_800_gi_4x << 26); + tmp169__ |= (pSrc->max_nc << 27); + tmp169__ |= (pSrc->stbc_gt_80mhz << 30); + frameshtonl(pCtx, pBuf, tmp169__, 0); + *pnConsumed += 4; + pBuf += 4; + nBuf -= 4 ; tmp170__ = 0U; - tmp170__ |= (pSrc->dual_band << 0); - tmp170__ |= (pSrc->chan_width_0 << 1); - tmp170__ |= (pSrc->chan_width_1 << 2); - tmp170__ |= (pSrc->chan_width_2 << 3); - tmp170__ |= (pSrc->chan_width_3 << 4); - tmp170__ |= (pSrc->chan_width_4 << 5); - tmp170__ |= (pSrc->chan_width_5 << 6); - tmp170__ |= (pSrc->chan_width_6 << 7); - tmp170__ |= (pSrc->rx_pream_puncturing << 8); - tmp170__ |= (pSrc->device_class << 12); - tmp170__ |= (pSrc->ldpc_coding << 13); - tmp170__ |= (pSrc->he_1x_ltf_800_gi_ppdu << 14); - tmp170__ |= (pSrc->midamble_rx_max_nsts << 15); - tmp170__ |= (pSrc->he_4x_ltf_3200_gi_ndp << 17); - tmp170__ |= (pSrc->stbc_lt_80mhz << 18); - tmp170__ |= (pSrc->doppler << 20); - tmp170__ |= (pSrc->ul_mu << 22); - tmp170__ |= (pSrc->dcm_enc_tx << 24); - tmp170__ |= (pSrc->dcm_enc_rx << 27); - tmp170__ |= (pSrc->ul_he_mu << 30); - tmp170__ |= (pSrc->su_beamformer << 31); - frameshtonl(pCtx, pBuf, tmp170__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; - tmp171__ = 0U; - tmp171__ |= (pSrc->su_beamformee << 0); - tmp171__ |= (pSrc->mu_beamformer << 1); - tmp171__ |= (pSrc->bfee_sts_lt_80 << 2); - tmp171__ |= (pSrc->bfee_sts_gt_80 << 5); - tmp171__ |= (pSrc->num_sounding_lt_80 << 8); - tmp171__ |= (pSrc->num_sounding_gt_80 << 11); - tmp171__ |= (pSrc->su_feedback_tone16 << 14); - tmp171__ |= (pSrc->mu_feedback_tone16 << 15); - tmp171__ |= (pSrc->codebook_su << 16); - tmp171__ |= (pSrc->codebook_mu << 17); - tmp171__ |= (pSrc->beamforming_feedback << 18); - tmp171__ |= (pSrc->he_er_su_ppdu << 21); - tmp171__ |= (pSrc->dl_mu_mimo_part_bw << 22); - tmp171__ |= (pSrc->ppet_present << 23); - tmp171__ |= (pSrc->srp << 24); - tmp171__ |= (pSrc->power_boost << 25); - tmp171__ |= (pSrc->he_ltf_800_gi_4x << 26); - tmp171__ |= (pSrc->max_nc << 27); - tmp171__ |= (pSrc->stbc_gt_80mhz << 30); - frameshtonl(pCtx, pBuf, tmp171__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; - tmp172__ = 0U; - tmp172__ |= (pSrc->er_he_ltf_800_gi_4x << 0); - tmp172__ |= (pSrc->he_ppdu_20_in_40Mhz_2G << 1); - tmp172__ |= (pSrc->he_ppdu_20_in_160_80p80Mhz << 2); - tmp172__ |= (pSrc->he_ppdu_80_in_160_80p80Mhz << 3); - tmp172__ |= (pSrc->er_1x_he_ltf_gi << 4); - tmp172__ |= (pSrc->midamble_rx_1x_he_ltf << 5); - tmp172__ |= (pSrc->reserved2 << 6); - *pBuf = tmp172__; + tmp170__ |= (pSrc->er_he_ltf_800_gi_4x << 0); + tmp170__ |= (pSrc->he_ppdu_20_in_40Mhz_2G << 1); + tmp170__ |= (pSrc->he_ppdu_20_in_160_80p80Mhz << 2); + tmp170__ |= (pSrc->he_ppdu_80_in_160_80p80Mhz << 3); + tmp170__ |= (pSrc->er_1x_he_ltf_gi << 4); + tmp170__ |= (pSrc->midamble_rx_1x_he_ltf << 5); + tmp170__ |= (pSrc->reserved2 << 6); + *pBuf = tmp170__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -23549,13 +23444,17 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->tx_he_mcs_map_80_80), (pSrc->chan_width_3 * 2)); *pnConsumed += (pSrc->chan_width_3 * 2); pBuf += (pSrc->chan_width_3 * 2); - status = pack_core(pCtx, - (uint8_t *)pSrc, - pBuf, - nBuf, - pnConsumed, - FFS_he_cap, - IES_he_cap); + if (pSrc->ppet_present) { + switch (pSrc->ppet_present) { + case 1: + DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->ppet.ppe_threshold.ppe_th), pSrc->ppet.ppe_threshold.num_ppe_th); + *pnConsumed += pSrc->ppet.ppe_threshold.num_ppe_th; + /* fieldsEndFlag = 1 */ + break; + } + } else { + break; + } break; } (void)pCtx; @@ -23574,7 +23473,7 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp173__; + uint32_t tmp171__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_op(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23588,19 +23487,19 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 36; ++pBuf; ++(*pnConsumed); - tmp173__ = 0U; - tmp173__ |= (pSrc->bss_color << 0); - tmp173__ |= (pSrc->default_pe << 6); - tmp173__ |= (pSrc->twt_required << 9); - tmp173__ |= (pSrc->rts_threshold << 10); - tmp173__ |= (pSrc->partial_bss_col << 20); - tmp173__ |= (pSrc->vht_oper_present << 21); - tmp173__ |= (pSrc->reserved1 << 22); - tmp173__ |= (pSrc->mbssid_ap << 28); - tmp173__ |= (pSrc->tx_bssid_ind << 29); - tmp173__ |= (pSrc->bss_col_disabled << 30); - tmp173__ |= (pSrc->reserved2 << 31); - frameshtonl(pCtx, pBuf, tmp173__, 0); + tmp171__ = 0U; + tmp171__ |= (pSrc->bss_color << 0); + tmp171__ |= (pSrc->default_pe << 6); + tmp171__ |= (pSrc->twt_required << 9); + tmp171__ |= (pSrc->rts_threshold << 10); + tmp171__ |= (pSrc->partial_bss_col << 20); + tmp171__ |= (pSrc->vht_oper_present << 21); + tmp171__ |= (pSrc->reserved1 << 22); + tmp171__ |= (pSrc->mbssid_ap << 28); + tmp171__ |= (pSrc->tx_bssid_ind << 29); + tmp171__ |= (pSrc->bss_col_disabled << 30); + tmp171__ |= (pSrc->reserved2 << 31); + frameshtonl(pCtx, pBuf, tmp171__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; @@ -23653,7 +23552,7 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp174__; + uint8_t tmp172__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_hs20vendor_ie(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23673,12 +23572,12 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 0x10; ++pBuf; ++(*pnConsumed); - tmp174__ = 0U; - tmp174__ |= (pSrc->dgaf_dis << 0); - tmp174__ |= (pSrc->hs_id_present << 1); - tmp174__ |= (pSrc->reserved << 3); - tmp174__ |= (pSrc->release_num << 4); - *pBuf = tmp174__; + tmp172__ = 0U; + tmp172__ |= (pSrc->dgaf_dis << 0); + tmp172__ |= (pSrc->hs_id_present << 1); + tmp172__ |= (pSrc->reserved << 3); + tmp172__ |= (pSrc->release_num << 4); + *pBuf = tmp172__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -23716,7 +23615,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 tmp175__; + uint8_t tmp173__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -23725,14 +23624,14 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp175__ = 0U; - tmp175__ |= (pSrc->info_request << 0); - tmp175__ |= (pSrc->forty_mhz_intolerant << 1); - tmp175__ |= (pSrc->twenty_mhz_bsswidth_req << 2); - tmp175__ |= (pSrc->obss_scan_exemption_req << 3); - tmp175__ |= (pSrc->obss_scan_exemption_grant << 4); - tmp175__ |= (pSrc->unused << 5); - *pBuf = tmp175__; + tmp173__ = 0U; + tmp173__ |= (pSrc->info_request << 0); + tmp173__ |= (pSrc->forty_mhz_intolerant << 1); + tmp173__ |= (pSrc->twenty_mhz_bsswidth_req << 2); + tmp173__ |= (pSrc->obss_scan_exemption_req << 3); + tmp173__ |= (pSrc->obss_scan_exemption_grant << 4); + tmp173__ |= (pSrc->unused << 5); + *pBuf = tmp173__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -23786,14 +23685,14 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint8_t tmp174__; + uint8_t tmp175__; uint8_t tmp176__; uint8_t tmp177__; uint8_t tmp178__; uint8_t tmp179__; uint8_t tmp180__; uint8_t tmp181__; - uint8_t tmp182__; - uint8_t tmp183__; nNeeded += 13; while (pSrc->present) { if (nNeeded > nBuf) @@ -23813,76 +23712,76 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->qos; *pnConsumed += 1; pBuf += 1; - tmp176__ = 0U; - tmp176__ |= (pSrc->acbe_aifsn << 0); - tmp176__ |= (pSrc->acbe_acm << 4); - tmp176__ |= (pSrc->acbe_aci << 5); - tmp176__ |= (pSrc->unused1 << 7); - *pBuf = tmp176__; + tmp174__ = 0U; + tmp174__ |= (pSrc->acbe_aifsn << 0); + tmp174__ |= (pSrc->acbe_acm << 4); + tmp174__ |= (pSrc->acbe_aci << 5); + tmp174__ |= (pSrc->unused1 << 7); + *pBuf = tmp174__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp177__ = 0U; - tmp177__ |= (pSrc->acbe_acwmin << 0); - tmp177__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp177__; + tmp175__ = 0U; + tmp175__ |= (pSrc->acbe_acwmin << 0); + tmp175__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp175__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acbe_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp178__ = 0U; - tmp178__ |= (pSrc->acbk_aifsn << 0); - tmp178__ |= (pSrc->acbk_acm << 4); - tmp178__ |= (pSrc->acbk_aci << 5); - tmp178__ |= (pSrc->unused2 << 7); - *pBuf = tmp178__; + tmp176__ = 0U; + tmp176__ |= (pSrc->acbk_aifsn << 0); + tmp176__ |= (pSrc->acbk_acm << 4); + tmp176__ |= (pSrc->acbk_aci << 5); + tmp176__ |= (pSrc->unused2 << 7); + *pBuf = tmp176__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp179__ = 0U; - tmp179__ |= (pSrc->acbk_acwmin << 0); - tmp179__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp179__; + tmp177__ = 0U; + tmp177__ |= (pSrc->acbk_acwmin << 0); + tmp177__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp177__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acbk_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp180__ = 0U; - tmp180__ |= (pSrc->acvi_aifsn << 0); - tmp180__ |= (pSrc->acvi_acm << 4); - tmp180__ |= (pSrc->acvi_aci << 5); - tmp180__ |= (pSrc->unused3 << 7); - *pBuf = tmp180__; + tmp178__ = 0U; + tmp178__ |= (pSrc->acvi_aifsn << 0); + tmp178__ |= (pSrc->acvi_acm << 4); + tmp178__ |= (pSrc->acvi_aci << 5); + tmp178__ |= (pSrc->unused3 << 7); + *pBuf = tmp178__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp181__ = 0U; - tmp181__ |= (pSrc->acvi_acwmin << 0); - tmp181__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp181__; + tmp179__ = 0U; + tmp179__ |= (pSrc->acvi_acwmin << 0); + tmp179__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp179__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acvi_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp182__ = 0U; - tmp182__ |= (pSrc->acvo_aifsn << 0); - tmp182__ |= (pSrc->acvo_acm << 4); - tmp182__ |= (pSrc->acvo_aci << 5); - tmp182__ |= (pSrc->unused4 << 7); - *pBuf = tmp182__; + tmp180__ = 0U; + tmp180__ |= (pSrc->acvo_aifsn << 0); + tmp180__ |= (pSrc->acvo_acm << 4); + tmp180__ |= (pSrc->acvo_aci << 5); + tmp180__ |= (pSrc->unused4 << 7); + *pBuf = tmp180__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp183__ = 0U; - tmp183__ |= (pSrc->acvo_acwmin << 0); - tmp183__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp183__; + tmp181__ = 0U; + tmp181__ |= (pSrc->acvo_acwmin << 0); + tmp181__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp181__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25058,14 +24957,6 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIER1KH_ID) * i), pBufRemaining, nBufRemaining, &len); break; - case SigIeppe_threshold: - status |= - dot11f_pack_ie_ppe_threshold( - pCtx, (tDot11fIEppe_threshold *) - (pSrc + pIe->offset + - sizeof(tDot11fIEppe_threshold) * i), - pBufRemaining, nBufRemaining, &len); - break; case SigIeAPChannelReport: status |= dot11f_pack_ie_ap_channel_report( 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 370661e95494..f2e02079726b 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 @@ -2842,6 +2842,8 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, qdf_mem_copy(&pAssocReq->he_cap, &ar->he_cap, sizeof(tDot11fIEhe_cap)); pe_debug("Received Assoc Req with HE Capability IE"); + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + &pAssocReq->he_cap, sizeof(tDot11fIEhe_cap)); } qdf_mem_free(ar); return eSIR_SUCCESS; @@ -6111,6 +6113,7 @@ tSirRetStatus populate_dot11f_timing_advert_frame(tpAniSirGlobal mac_ctx, QDF_STATUS populate_dot11f_he_caps(tpAniSirGlobal mac_ctx, tpPESession session, tDot11fIEhe_cap *he_cap) { + uint8_t *ppet; uint32_t value = 0; tSirRetStatus status; @@ -6294,9 +6297,13 @@ QDF_STATUS populate_dot11f_he_caps(tpAniSirGlobal mac_ctx, tpPESession session, value = WNI_CFG_HE_PPET_LEN; /* if session less then take 5g cap */ CFG_GET_STR(status, mac_ctx, WNI_CFG_HE_PPET_5G, - (void *)&he_cap->ppe_threshold, value, value); + he_cap->ppet.ppe_threshold.ppe_th, + value, value); + ppet = he_cap->ppet.ppe_threshold.ppe_th; + he_cap->ppet.ppe_threshold.num_ppe_th = + lim_truncate_ppet(ppet, value); } else { - he_cap->ppe_threshold.present = false; + he_cap->ppet.ppe_threshold.num_ppe_th = 0; } return QDF_STATUS_SUCCESS; @@ -6308,14 +6315,17 @@ QDF_STATUS populate_dot11f_he_caps(tpAniSirGlobal mac_ctx, tpPESession session, /* if session is present, populate PPET based on band */ if (IS_5G_CH(session->currentOperChannel)) CFG_GET_STR(status, mac_ctx, WNI_CFG_HE_PPET_5G, - (void *)&he_cap->ppe_threshold, + he_cap->ppet.ppe_threshold.ppe_th, value, value); else CFG_GET_STR(status, mac_ctx, WNI_CFG_HE_PPET_2G, - (void *)&he_cap->ppe_threshold, + he_cap->ppet.ppe_threshold.ppe_th, value, value); + ppet = he_cap->ppet.ppe_threshold.ppe_th; + he_cap->ppet.ppe_threshold.num_ppe_th = + lim_truncate_ppet(ppet, value); } else { - he_cap->ppe_threshold.present = false; + he_cap->ppet.ppe_threshold.num_ppe_th = 0; } lim_log_he_cap(mac_ctx, he_cap); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index a254eeb4341b..11348a19cb8a 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -2497,9 +2497,12 @@ static void csr_update_session_he_cap(tpAniSirGlobal mac_ctx, value = WNI_CFG_HE_PPET_LEN; /* till now operating channel is not decided yet, use 5g cap */ sme_cfg_get_str(mac_ctx, WNI_CFG_HE_PPET_5G, - (void *)&he_cap->ppe_threshold, &value); + he_cap->ppet.ppe_threshold.ppe_th, &value); + he_cap->ppet.ppe_threshold.num_ppe_th = + lim_truncate_ppet(he_cap->ppet.ppe_threshold.ppe_th, + value); } else { - he_cap->ppe_threshold.present = false; + he_cap->ppet.ppe_threshold.num_ppe_th = 0; } sme_cfg_get_int(mac_ctx, WNI_CFG_HE_STA_OBSSPD, &value); session->he_sta_obsspd = value; diff --git a/core/wma/inc/wma_tgt_cfg.h b/core/wma/inc/wma_tgt_cfg.h index 6ca66f0a1092..011ec3d1ef1f 100644 --- a/core/wma/inc/wma_tgt_cfg.h +++ b/core/wma/inc/wma_tgt_cfg.h @@ -191,8 +191,8 @@ struct wma_tgt_cfg { uint16_t wmi_max_len; #ifdef WLAN_FEATURE_11AX tDot11fIEhe_cap he_cap; - tDot11fIEppe_threshold ppet_2g; - tDot11fIEppe_threshold ppet_5g; + uint8_t ppet_2g[HE_MAX_PPET_SIZE]; + uint8_t ppet_5g[HE_MAX_PPET_SIZE]; #endif bool dfs_cac_offload; bool tx_bfee_8ss_enabled; diff --git a/core/wma/src/wma_he.c b/core/wma/src/wma_he.c index 4e44020fac6a..c05c8c1f9bc6 100644 --- a/core/wma/src/wma_he.c +++ b/core/wma/src/wma_he.c @@ -71,7 +71,7 @@ static void wma_he_ppet_merge(uint8_t *host_ppet, int *byte_idx_p, int *used_p, } /** - * wma_he_find_ppet() - Helper function for PPET conversion + * wma_he_populate_ppet() - Helper function for PPET conversion * @ppet: pointer to fw array * @nss: Number of NSS * @ru: Number of RU @@ -84,8 +84,8 @@ static void wma_he_ppet_merge(uint8_t *host_ppet, int *byte_idx_p, int *used_p, * * Return: None */ -static void wma_he_find_ppet(uint32_t *ppet, int nss, int ru, - uint8_t *host_ppet, int req_byte) +static void wma_he_populate_ppet(uint32_t *ppet, int nss, int ru, + uint8_t *host_ppet, int req_byte) { int byte_idx = 0, used, i, j; uint8_t ppet16, ppet8; @@ -119,23 +119,25 @@ static void wma_he_find_ppet(uint32_t *ppet, int nss, int ru, * * Return: None */ -static void wma_convert_he_ppet(tDot11fIEppe_threshold *he_ppet, +static void wma_convert_he_ppet(uint8_t *he_ppet, struct wmi_host_ppe_threshold *ppet) { int bits, req_byte; - uint8_t *host_ppet, ru_count, mask; + struct ppet_hdr *hdr; + uint8_t ru_count, mask; + struct ppe_threshold *ppet_1; + ppet_1 = NULL; if (!ppet) { WMA_LOGE(FL("PPET is NULL")); - he_ppet->present = false; + qdf_mem_zero(he_ppet, HE_MAX_PPET_SIZE); return; } - he_ppet->present = true; - he_ppet->nss_count = ppet->numss_m1; - he_ppet->ru_idx_mask = ppet->ru_bit_mask; - - mask = he_ppet->ru_idx_mask; + hdr = (struct ppet_hdr *)he_ppet; + hdr->nss = ppet->numss_m1; + hdr->ru_idx_mask = ppet->ru_bit_mask; + mask = hdr->ru_idx_mask; for (ru_count = 0; mask; mask >>= 1) if (mask & 0x01) ru_count++; @@ -144,33 +146,12 @@ static void wma_convert_he_ppet(tDot11fIEppe_threshold *he_ppet, * there will be two PPET for each NSS/RU pair * PPET8 and PPET16, hence HE_PPET_SIZE * 2 bits for PPET */ - bits = HE_PPET_NSS_RU_LEN + ((he_ppet->nss_count + 1) * ru_count) * + bits = HE_PPET_NSS_RU_LEN + ((hdr->nss + 1) * ru_count) * (HE_PPET_SIZE * 2); req_byte = (bits / HE_BYTE_SIZE) + 1; - - host_ppet = qdf_mem_malloc(sizeof(*host_ppet) * req_byte); - if (!host_ppet) { - WMA_LOGE(FL("mem alloc failed for host_ppet")); - he_ppet->present = false; - return; - } - - wma_he_find_ppet(ppet->ppet16_ppet8_ru3_ru0, he_ppet->nss_count + 1, - ru_count, host_ppet, req_byte); - - he_ppet->ppet_b1 = (host_ppet[0] << HE_PPET_NSS_RU_LEN); - - /* - * req_byte calculates total bytes, num_ppet stores only the bytes - * going into ppet data member in he_ppet. -1 to exclude the byte - * storing nss/ru and first PPET16. - */ - he_ppet->num_ppet = req_byte - 1; - if (he_ppet->num_ppet > 0) - qdf_mem_copy(he_ppet->ppet, &host_ppet[1], he_ppet->num_ppet); - - qdf_mem_free(host_ppet); + wma_he_populate_ppet(ppet->ppet16_ppet8_ru3_ru0, hdr->nss + 1, + ru_count, he_ppet, req_byte); } /** @@ -526,6 +507,7 @@ static void wma_derive_ext_he_cap(t_wma_handle *wma_handle, void wma_print_he_cap(tDot11fIEhe_cap *he_cap) { uint8_t chan_width; + struct ppet_hdr *hdr; if (!he_cap->present) { WMA_LOGI(FL("HE Capabilities not present")); @@ -644,12 +626,14 @@ void wma_print_he_cap(tDot11fIEhe_cap *he_cap) WMA_LOGD("\tTx MCS MAP for BW = 80 + 80 MHz: 0x%x", *((uint16_t *)he_cap->tx_he_mcs_map_80_80)); + hdr = (struct ppet_hdr *)&he_cap->ppet.ppe_threshold.ppe_th[0]; /* HE PPET */ - WMA_LOGD("\tNSS: %d", he_cap->ppe_threshold.nss_count + 1); - WMA_LOGD("\tRU Index mask: 0x%04x", he_cap->ppe_threshold.ru_idx_mask); - WMA_LOGD("\tnum_ppet: %d", he_cap->ppe_threshold.num_ppet); + WMA_LOGD("\tNSS: %d", hdr->nss + 1); + WMA_LOGD("\tRU Index mask: 0x%04x", hdr->ru_idx_mask); + WMA_LOGD("\tnum_ppet: %d", he_cap->ppet.ppe_threshold.num_ppe_th); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, - he_cap->ppe_threshold.ppet, he_cap->ppe_threshold.num_ppet); + he_cap->ppet.ppe_threshold.ppe_th, + he_cap->ppet.ppe_threshold.num_ppe_th); } void wma_print_he_ppet(void *he_ppet) @@ -877,7 +861,7 @@ void wma_update_target_ext_he_cap(tp_wma_handle wma_handle, WMA_LOGD(FL("2g phy: nss: %d, ru_idx_msk: %d"), mac_cap->he_ppet2G.numss_m1, mac_cap->he_ppet2G.ru_mask); - wma_convert_he_ppet(&tgt_cfg->ppet_2g, + wma_convert_he_ppet(tgt_cfg->ppet_2g, (struct wmi_host_ppe_threshold *) &mac_cap->he_ppet2G); } @@ -898,7 +882,7 @@ void wma_update_target_ext_he_cap(tp_wma_handle wma_handle, WMA_LOGD(FL("5g phy: nss: %d, ru_idx_msk: %d"), mac_cap->he_ppet2G.numss_m1, mac_cap->he_ppet2G.ru_mask); - wma_convert_he_ppet(&tgt_cfg->ppet_5g, + wma_convert_he_ppet(tgt_cfg->ppet_5g, (struct wmi_host_ppe_threshold *) &mac_cap->he_ppet5G); } @@ -938,7 +922,7 @@ void wma_print_he_op(tDot11fIEhe_op *he_ops) /** * wma_parse_he_ppet() - Convert PPET stored in dot11f structure into FW * structure. - * @dot11f_ppet: pointer to dot11f format PPET + * @rcvd_ppet: pointer to dot11f format PPET * @peer_ppet: pointer peer_ppet to be sent in peer assoc * * This function converts the sequence of PPET stored in the host in OTA type @@ -947,19 +931,22 @@ void wma_print_he_op(tDot11fIEhe_op *he_ops) * * Return: None */ -static void wma_parse_he_ppet(tDot11fIEppe_threshold *dot11f_ppet, +static void wma_parse_he_ppet(int8_t *rcvd_ppet, struct wmi_host_ppe_threshold *peer_ppet) { + struct ppet_hdr *hdr; uint8_t num_ppet, mask, mask1, mask2; uint32_t ppet1, ppet2, ppet; uint8_t bits, pad, pad_bits, req_byte; uint8_t byte_idx, start, i, j, parsed; uint32_t *ppet_r = peer_ppet->ppet16_ppet8_ru3_ru0; - uint8_t *rcvd_ppet; uint8_t nss, ru; - nss = dot11f_ppet->nss_count + 1; - mask = dot11f_ppet->ru_idx_mask; + hdr = (struct ppet_hdr *)rcvd_ppet; + nss = hdr->nss + 1; + mask = hdr->ru_idx_mask; + peer_ppet->numss_m1 = nss - 1; + peer_ppet->ru_bit_mask = mask; for (ru = 0; mask; mask >>= 1) { if (mask & 0x1) @@ -967,21 +954,7 @@ static void wma_parse_he_ppet(tDot11fIEppe_threshold *dot11f_ppet, } WMA_LOGD(FL("Rcvd nss=%d ru_idx_mask: %0x ru_count=%d"), - nss, mask, ru); - - /* rcvd_ppet will store the ppet array and first byte of the ppet */ - rcvd_ppet = qdf_mem_malloc(sizeof(*rcvd_ppet) * - (dot11f_ppet->num_ppet + 1)); - if (!rcvd_ppet) { - WMA_LOGE(FL("mem alloc failed")); - return; - } - - rcvd_ppet[0] = (dot11f_ppet->ppet_b1 << 7); - qdf_mem_copy(&rcvd_ppet[1], dot11f_ppet->ppet, dot11f_ppet->num_ppet); - - peer_ppet->numss_m1 = nss - 1; - peer_ppet->ru_bit_mask = dot11f_ppet->ru_idx_mask; + nss, hdr->ru_idx_mask, ru); /* each nss-ru pair have 2 PPET (PPET8/PPET16) */ bits = HE_PPET_NSS_RU_LEN + (nss + ru) * (HE_PPET_SIZE * 2); @@ -1006,7 +979,7 @@ static void wma_parse_he_ppet(tDot11fIEppe_threshold *dot11f_ppet, */ /* first bit of first PPET is in the last bit of first byte */ - parsed = 7; + parsed = HE_PPET_NSS_RU_LEN; /* * refer wmi_ppe_threshold defn to understand how ppet is stored. @@ -1038,8 +1011,6 @@ static void wma_parse_he_ppet(tDot11fIEppe_threshold *dot11f_ppet, ppet_r[i]); } } - - qdf_mem_free(rcvd_ppet); } void wma_populate_peer_he_cap(struct peer_assoc_params *peer, @@ -1195,7 +1166,7 @@ void wma_populate_peer_he_cap(struct peer_assoc_params *peer, WMI_HEOPS_BSSCOLORDISABLE_SET(he_ops, he_op->bss_col_disabled); peer->peer_he_ops = he_ops; - wma_parse_he_ppet(&he_cap->ppe_threshold, &peer->peer_ppet); + wma_parse_he_ppet(he_cap->ppet.ppe_threshold.ppe_th, &peer->peer_ppet); wma_print_he_cap(he_cap); WMA_LOGD(FL("Peer HE Capabilities:"));