From 215dad62348e2f26e7632b3b2fdd40aabca31119 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Mon, 16 Oct 2017 16:55:18 -0700 Subject: [PATCH] qcacld-3.0: Update 11AX - Draft 1.4 MCS support - 1/2 Update HE capability IE as per Draft 1.4 for MCS support. Change-Id: I207db123d463f54ed6b148c9e957eb551d617ca2 CRs-Fixed: 2130185 --- core/mac/src/cfg/cfgUtil/dot11f.frms | 20 +- core/mac/src/include/dot11f.h | 24 +- .../mac/src/sys/legacy/src/utils/src/dot11f.c | 1733 +++++++++-------- 3 files changed, 923 insertions(+), 854 deletions(-) diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms index fda797dafdfe..2be37df5d687 100644 --- a/core/mac/src/cfg/cfgUtil/dot11f.frms +++ b/core/mac/src/cfg/cfgUtil/dot11f.frms @@ -2842,7 +2842,13 @@ IE he_cap (EID_EXTN_ID_ELEMENT) OUI (0x23) } { dual_band:1; - chan_width:7; + chan_width_0:1; + chan_width_1:1; + chan_width_2:1; + chan_width_3:1; + chan_width_4:1; + chan_width_5:1; + chan_width_6:1; rx_pream_puncturing:4; device_class:1; ldpc_coding:1; @@ -2882,12 +2888,12 @@ IE he_cap (EID_EXTN_ID_ELEMENT) OUI (0x23) er_he_ltf_800_gi_4x:1; reserved2:7; } - { - nss_supported:3; - mcs_supported:3; - tx_bw_bitmap:5; - rx_bw_bitmap:5; - } + rx_he_mcs_map_lt_80, 2; + tx_he_mcs_map_lt_80, 2; + rx_he_mcs_map_160[2][0..1] COUNTIS chan_width_2; + 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) { { diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index da04f87b4735..53feffccc824 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' - * Fri Oct 20 13:48:39 2017 from the following file(s): + * Mon Oct 23 14:35:45 2017 from the following file(s): * * dot11f.frms * @@ -8707,7 +8707,13 @@ typedef struct sDot11fIEhe_cap { uint8_t ops_supp:1; uint8_t reserved1:2; uint32_t dual_band:1; - uint32_t chan_width:7; + 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; @@ -8742,19 +8748,21 @@ typedef struct sDot11fIEhe_cap { uint32_t stbc_gt_80mhz:2; uint8_t er_he_ltf_800_gi_4x:1; uint8_t reserved2:7; - uint16_t nss_supported:3; - uint16_t mcs_supported:3; - uint16_t tx_bw_bitmap:5; - uint16_t rx_bw_bitmap:5; + 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; } tDot11fIEhe_cap; #define DOT11F_EID_HE_CAP (255) /* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_HE_CAP_MIN_LEN (16) +#define DOT11F_IE_HE_CAP_MIN_LEN (18) -#define DOT11F_IE_HE_CAP_MAX_LEN (43) +#define DOT11F_IE_HE_CAP_MAX_LEN (53) #ifdef __cplusplus extern "C" { 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 1c698fd9816e..c8ad92cbf5d9 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' - * Fri Oct 20 13:48:39 2017 from the following file(s): + * Mon Oct 23 14:35:45 2017 from the following file(s): * * dot11f.frms * @@ -6545,7 +6545,6 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, uint32_t tmp78__; uint32_t tmp79__; uint8_t tmp80__; - uint16_t tmp81__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -6590,7 +6589,13 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, pBuf += 4; ielen -= 4; pDst->dual_band = tmp78__ >> 0 & 0x1; - pDst->chan_width = tmp78__ >> 1 & 0x7f; + 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; @@ -6631,13 +6636,44 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, ielen -= 1; pDst->er_he_ltf_800_gi_4x = tmp80__ >> 0 & 0x1; pDst->reserved2 = tmp80__ >> 1 & 0x7f; - framesntohs(pCtx, &tmp81__, pBuf, 0); + framesntohs(pCtx, &pDst->rx_he_mcs_map_lt_80, pBuf, 0); pBuf += 2; - ielen -= 2; - pDst->nss_supported = tmp81__ >> 0 & 0x7; - pDst->mcs_supported = tmp81__ >> 3 & 0x7; - pDst->tx_bw_bitmap = tmp81__ >> 6 & 0x1f; - pDst->rx_bw_bitmap = tmp81__ >> 11 & 0x1f; + ielen -= (uint8_t)2; + framesntohs(pCtx, &pDst->tx_he_mcs_map_lt_80, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + if (pDst->chan_width_2 > 1) { + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->rx_he_mcs_map_160, pBuf, (pDst->chan_width_2 * 2)); + pBuf += (pDst->chan_width_2 * 2); + ielen -= (pDst->chan_width_2 * 2); + if (pDst->chan_width_2 > 1) { + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->tx_he_mcs_map_160, pBuf, (pDst->chan_width_2 * 2)); + pBuf += (pDst->chan_width_2 * 2); + ielen -= (pDst->chan_width_2 * 2); + if (pDst->chan_width_3 > 1) { + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + DOT11F_MEMCPY(pCtx, pDst->rx_he_mcs_map_80_80, pBuf, (pDst->chan_width_3 * 2)); + pBuf += (pDst->chan_width_3 * 2); + ielen -= (pDst->chan_width_3 * 2); + if (pDst->chan_width_3 > 1) { + pDst->present = 0; + return DOT11F_SKIPPED_BAD_IE; + } + + 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); (void)pCtx; status |= unpack_core(pCtx, pBuf, @@ -6660,25 +6696,25 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint32_t tmp82__; + uint32_t tmp81__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohl(pCtx, &tmp82__, pBuf, 0); + framesntohl(pCtx, &tmp81__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->bss_color = tmp82__ >> 0 & 0x3f; - pDst->default_pe = tmp82__ >> 6 & 0x7; - pDst->twt_required = tmp82__ >> 9 & 0x1; - pDst->rts_threshold = tmp82__ >> 10 & 0x3ff; - pDst->partial_bss_col = tmp82__ >> 20 & 0x1; - pDst->vht_oper_present = tmp82__ >> 21 & 0x1; - pDst->reserved1 = tmp82__ >> 22 & 0x3f; - pDst->mbssid_ap = tmp82__ >> 28 & 0x1; - pDst->tx_bssid_ind = tmp82__ >> 29 & 0x1; - pDst->bss_col_disabled = tmp82__ >> 30 & 0x1; - pDst->reserved2 = tmp82__ >> 31 & 0x1; + 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; DOT11F_MEMCPY(pCtx, pDst->basic_mcs_nss, pBuf, 3); pBuf += 3; ielen -= (uint8_t)3; @@ -6716,18 +6752,18 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(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; + tmp82__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->dgaf_dis = tmp83__ >> 0 & 0x1; - pDst->hs_id_present = tmp83__ >> 1 & 0x3; - pDst->reserved = tmp83__ >> 3 & 0x1; - pDst->release_num = tmp83__ >> 4 & 0xf; + pDst->dgaf_dis = tmp82__ >> 0 & 0x1; + pDst->hs_id_present = tmp82__ >> 1 & 0x3; + pDst->reserved = tmp82__ >> 3 & 0x1; + pDst->release_num = tmp82__ >> 4 & 0xf; if (!ielen) { return 0U; } else { @@ -6758,18 +6794,18 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp84__; + uint8_t tmp83__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp84__ = *pBuf; - pDst->info_request = tmp84__ >> 0 & 0x1; - pDst->forty_mhz_intolerant = tmp84__ >> 1 & 0x1; - pDst->twenty_mhz_bsswidth_req = tmp84__ >> 2 & 0x1; - pDst->obss_scan_exemption_req = tmp84__ >> 3 & 0x1; - pDst->obss_scan_exemption_grant = tmp84__ >> 4 & 0x1; - pDst->unused = tmp84__ >> 5 & 0x7; + 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; (void)pCtx; return status; } /* End dot11f_unpack_ie_ht2040_bss_coexistence. */ @@ -6812,6 +6848,7 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp84__; uint8_t tmp85__; uint8_t tmp86__; uint8_t tmp87__; @@ -6819,7 +6856,6 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp89__; uint8_t tmp90__; uint8_t tmp91__; - uint8_t tmp92__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -6827,63 +6863,63 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, pDst->qos = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + 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_aifsn = tmp85__ >> 0 & 0xf; - pDst->acbe_acm = tmp85__ >> 4 & 0x1; - pDst->acbe_aci = tmp85__ >> 5 & 0x3; - pDst->unused1 = tmp85__ >> 7 & 0x1; - tmp86__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_acwmin = tmp86__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp86__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp85__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp85__ >> 4 & 0xf; pDst->acbe_muedca_timer = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + 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_aifsn = tmp87__ >> 0 & 0xf; - pDst->acbk_acm = tmp87__ >> 4 & 0x1; - pDst->acbk_aci = tmp87__ >> 5 & 0x3; - pDst->unused2 = tmp87__ >> 7 & 0x1; - tmp88__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbk_acwmin = tmp88__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp88__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp87__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp87__ >> 4 & 0xf; pDst->acbk_muedca_timer = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + 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_aifsn = tmp89__ >> 0 & 0xf; - pDst->acvi_acm = tmp89__ >> 4 & 0x1; - pDst->acvi_aci = tmp89__ >> 5 & 0x3; - pDst->unused3 = tmp89__ >> 7 & 0x1; - tmp90__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvi_acwmin = tmp90__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp90__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp89__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp89__ >> 4 & 0xf; pDst->acvi_muedca_timer = *pBuf; pBuf += 1; ielen -= (uint8_t)1; + 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_aifsn = tmp91__ >> 0 & 0xf; - pDst->acvo_acm = tmp91__ >> 4 & 0x1; - pDst->acvo_aci = tmp91__ >> 5 & 0x3; - pDst->unused4 = tmp91__ >> 7 & 0x1; - tmp92__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acvo_acwmin = tmp92__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp92__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp91__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp91__ >> 4 & 0xf; pDst->acvo_muedca_timer = *pBuf; (void)pCtx; return status; @@ -7226,7 +7262,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 55, 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}, @@ -7385,7 +7421,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 55, 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, 9, 13, SigIehe_op, {0, 0, 0, 0, 0}, @@ -7678,7 +7714,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + "he_cap", 0, 20, 55, 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, 9, 13, SigIehe_op, {0, 0, 0, 0, 0}, @@ -7904,7 +7940,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + "he_cap", 0, 20, 55, 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, 9, 13, SigIehe_op, {0, 0, 0, 0, 0}, @@ -8130,7 +8166,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + 0, "he_cap", 0, 20, 55, 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, 9, 13, SigIehe_op, {0, 0, 0, 0, 0}, @@ -8565,7 +8601,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 55, 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, },}; @@ -8775,7 +8811,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 55, 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, 9, 13, SigIehe_op, {0, 0, 0, 0, 0}, @@ -9038,7 +9074,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 55, 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, },}; @@ -9174,7 +9210,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, 18, 45, SigIehe_cap, {0, 0, 0, 0, 0}, + present), 0, "he_cap", 0, 20, 55, 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, 9, 13, SigIehe_op, {0, 0, 0, 0, 0}, @@ -13252,6 +13288,11 @@ uint32_t dot11f_get_packed_ie_he_cap(tpAniSirGlobal pCtx, *pnNeeded += 4; *pnNeeded += 1; *pnNeeded += 2; + *pnNeeded += 2; + *pnNeeded += (pIe->chan_width_2 * 2); + *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); break; @@ -15347,25 +15388,25 @@ void dot11f_pack_ff_capabilities(tpAniSirGlobal pCtx, tDot11fFfCapabilities *pSrc, uint8_t *pBuf) { - uint16_t tmp93__; - tmp93__ = 0U; - tmp93__ |= (pSrc->ess << 0); - tmp93__ |= (pSrc->ibss << 1); - tmp93__ |= (pSrc->cfPollable << 2); - tmp93__ |= (pSrc->cfPollReq << 3); - tmp93__ |= (pSrc->privacy << 4); - tmp93__ |= (pSrc->shortPreamble << 5); - tmp93__ |= (pSrc->pbcc << 6); - tmp93__ |= (pSrc->channelAgility << 7); - tmp93__ |= (pSrc->spectrumMgt << 8); - tmp93__ |= (pSrc->qos << 9); - tmp93__ |= (pSrc->shortSlotTime << 10); - tmp93__ |= (pSrc->apsd << 11); - tmp93__ |= (pSrc->rrm << 12); - tmp93__ |= (pSrc->dsssOfdm << 13); - tmp93__ |= (pSrc->delayedBA << 14); - tmp93__ |= (pSrc->immediateBA << 15); - frameshtons(pCtx, pBuf, tmp93__, 0); + 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); (void)pCtx; } /* End dot11f_pack_ff_capabilities. */ @@ -15429,13 +15470,13 @@ void dot11f_pack_ff_operating_mode(tpAniSirGlobal pCtx, tDot11fFfOperatingMode *pSrc, uint8_t *pBuf) { - uint8_t tmp94__; - tmp94__ = 0U; - tmp94__ |= (pSrc->chanWidth << 0); - tmp94__ |= (pSrc->reserved << 2); - tmp94__ |= (pSrc->rxNSS << 4); - tmp94__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp94__; + uint8_t tmp93__; + tmp93__ = 0U; + tmp93__ |= (pSrc->chanWidth << 0); + tmp93__ |= (pSrc->reserved << 2); + tmp93__ |= (pSrc->rxNSS << 4); + tmp93__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp93__; (void)pCtx; } /* End dot11f_pack_ff_operating_mode. */ @@ -15475,12 +15516,12 @@ void dot11f_pack_ff_sm_power_mode_set(tpAniSirGlobal pCtx, tDot11fFfSMPowerModeSet *pSrc, uint8_t *pBuf) { - uint8_t tmp95__; - tmp95__ = 0U; - tmp95__ |= (pSrc->PowerSave_En << 0); - tmp95__ |= (pSrc->Mode << 1); - tmp95__ |= (pSrc->reserved << 2); - *pBuf = tmp95__; + uint8_t tmp94__; + tmp94__ = 0U; + tmp94__ |= (pSrc->PowerSave_En << 0); + tmp94__ |= (pSrc->Mode << 1); + tmp94__ |= (pSrc->reserved << 2); + *pBuf = tmp94__; (void)pCtx; } /* End dot11f_pack_ff_sm_power_mode_set. */ @@ -15520,19 +15561,19 @@ void dot11f_pack_ff_ts_info(tpAniSirGlobal pCtx, tDot11fFfTSInfo *pSrc, uint8_t *pBuf) { - uint32_t tmp96__; - tmp96__ = 0U; - tmp96__ |= (pSrc->traffic_type << 0); - tmp96__ |= (pSrc->tsid << 1); - tmp96__ |= (pSrc->direction << 5); - tmp96__ |= (pSrc->access_policy << 7); - tmp96__ |= (pSrc->aggregation << 9); - tmp96__ |= (pSrc->psb << 10); - tmp96__ |= (pSrc->user_priority << 11); - tmp96__ |= (pSrc->tsinfo_ack_pol << 14); - tmp96__ |= (pSrc->schedule << 16); - tmp96__ |= (pSrc->unused << 17); - frameshtonl(pCtx, pBuf, tmp96__, 0); + 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); (void)pCtx; } /* End dot11f_pack_ff_ts_info. */ @@ -15588,13 +15629,13 @@ void dot11f_pack_ff_addba_param_set(tpAniSirGlobal pCtx, tDot11fFfaddba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp97__; - tmp97__ = 0U; - tmp97__ |= (pSrc->amsdu_supp << 0); - tmp97__ |= (pSrc->policy << 1); - tmp97__ |= (pSrc->tid << 2); - tmp97__ |= (pSrc->buff_size << 6); - frameshtons(pCtx, pBuf, tmp97__, 0); + 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); (void)pCtx; } /* End dot11f_pack_ff_addba_param_set. */ @@ -15602,11 +15643,11 @@ void dot11f_pack_ff_ba_start_seq_ctrl(tpAniSirGlobal pCtx, tDot11fFfba_start_seq_ctrl *pSrc, uint8_t *pBuf) { - uint16_t tmp98__; - tmp98__ = 0U; - tmp98__ |= (pSrc->frag_number << 0); - tmp98__ |= (pSrc->ssn << 4); - frameshtons(pCtx, pBuf, tmp98__, 0); + uint16_t tmp97__; + tmp97__ = 0U; + tmp97__ |= (pSrc->frag_number << 0); + tmp97__ |= (pSrc->ssn << 4); + frameshtons(pCtx, pBuf, tmp97__, 0); (void)pCtx; } /* End dot11f_pack_ff_ba_start_seq_ctrl. */ @@ -15622,12 +15663,12 @@ void dot11f_pack_ff_delba_param_set(tpAniSirGlobal pCtx, tDot11fFfdelba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp99__; - tmp99__ = 0U; - tmp99__ |= (pSrc->reserved << 0); - tmp99__ |= (pSrc->initiator << 11); - tmp99__ |= (pSrc->tid << 12); - frameshtons(pCtx, pBuf, tmp99__, 0); + uint16_t tmp98__; + tmp98__ = 0U; + tmp98__ |= (pSrc->reserved << 0); + tmp98__ |= (pSrc->initiator << 11); + tmp98__ |= (pSrc->tid << 12); + frameshtons(pCtx, pBuf, tmp98__, 0); (void)pCtx; } /* End dot11f_pack_ff_delba_param_set. */ @@ -15635,13 +15676,13 @@ void dot11f_pack_ff_ext_chan_switch_ann_action(tpAniSirGlobal pCtx, tDot11fFfext_chan_switch_ann_action *pSrc, uint8_t *pBuf) { - uint32_t tmp100__; - tmp100__ = 0U; - tmp100__ |= (pSrc->switch_mode << 0); - tmp100__ |= (pSrc->op_class << 8); - tmp100__ |= (pSrc->new_channel << 16); - tmp100__ |= (pSrc->switch_count << 24); - frameshtonl(pCtx, pBuf, tmp100__, 0); + 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); (void)pCtx; } /* End dot11f_pack_ff_ext_chan_switch_ann_action. */ @@ -15728,7 +15769,7 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp101__; + uint8_t tmp100__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -15737,10 +15778,10 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - 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 ; @@ -16697,7 +16738,7 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp102__; + uint8_t tmp101__; nNeeded += 5; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -16706,10 +16747,10 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, pBuf += 2; *pnConsumed += 2; pTlvLen = pBuf; pBuf += 2; *pnConsumed += 2; - tmp102__ = 0U; - tmp102__ |= (pSrc->minor << 0); - tmp102__ |= (pSrc->major << 4); - *pBuf = tmp102__; + tmp101__ = 0U; + tmp101__ |= (pSrc->minor << 0); + tmp101__ |= (pSrc->major << 4); + *pBuf = tmp101__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16938,7 +16979,7 @@ uint32_t dot11f_pack_tlv_oce_cap(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; @@ -16947,12 +16988,12 @@ uint32_t dot11f_pack_tlv_oce_cap(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp103__ = 0U; - tmp103__ |= (pSrc->oce_release << 0); - tmp103__ |= (pSrc->is_sta_cfon << 3); - tmp103__ |= (pSrc->non_oce_ap_present << 4); - tmp103__ |= (pSrc->reserved << 5); - *pBuf = tmp103__; + 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__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16974,7 +17015,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 tmp104__; + uint8_t tmp103__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -16983,10 +17024,10 @@ uint32_t dot11f_pack_tlv_reduced_wan_metrics(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp104__ = 0U; - tmp104__ |= (pSrc->downlink_av_cap << 0); - tmp104__ |= (pSrc->uplink_av_cap << 4); - *pBuf = tmp104__; + tmp103__ = 0U; + tmp103__ |= (pSrc->downlink_av_cap << 0); + tmp103__ |= (pSrc->uplink_av_cap << 4); + *pBuf = tmp103__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17156,7 +17197,7 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp105__; + uint16_t tmp104__; nNeeded += (pSrc->num_key + 11); while (pSrc->present) { if (nNeeded > nBuf) @@ -17165,10 +17206,10 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp105__ = 0U; - tmp105__ |= (pSrc->keyId << 0); - tmp105__ |= (pSrc->reserved << 2); - frameshtons(pCtx, pBuf, tmp105__, 0); + tmp104__ = 0U; + tmp104__ |= (pSrc->keyId << 0); + tmp104__ |= (pSrc->reserved << 2); + frameshtons(pCtx, pBuf, tmp104__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -17296,7 +17337,7 @@ uint32_t dot11f_pack_ie_ppe_threshold(tpAniSirGlobal pCtx, uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; uint8_t ru_mask, ru_count; - uint8_t tmp106__; + uint8_t tmp105__; nNeeded += (pSrc->num_ppet + 1); while (pSrc->present) { if (nNeeded > nBuf) @@ -17305,11 +17346,11 @@ uint32_t dot11f_pack_ie_ppe_threshold(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp106__ = 0U; - tmp106__ |= (pSrc->nss_count << 0); - tmp106__ |= (pSrc->ru_idx_mask << 3); - tmp106__ |= (pSrc->ppet_b1 << 7); - *pBuf = tmp106__; + 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 ; @@ -17624,11 +17665,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 tmp106__; uint8_t tmp107__; uint8_t tmp108__; uint8_t tmp109__; uint8_t tmp110__; - uint8_t tmp111__; nNeeded += 5; while (pSrc->present) { if (nNeeded > nBuf) @@ -17637,60 +17678,60 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); + 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); + *pBuf = tmp106__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; tmp107__ = 0U; - tmp107__ |= (pSrc->LinkMeasurement << 0); - tmp107__ |= (pSrc->NeighborRpt << 1); - tmp107__ |= (pSrc->parallel << 2); - tmp107__ |= (pSrc->repeated << 3); - tmp107__ |= (pSrc->BeaconPassive << 4); - tmp107__ |= (pSrc->BeaconActive << 5); - tmp107__ |= (pSrc->BeaconTable << 6); - tmp107__ |= (pSrc->BeaconRepCond << 7); + 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); *pBuf = tmp107__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp108__ = 0U; - tmp108__ |= (pSrc->FrameMeasurement << 0); - tmp108__ |= (pSrc->ChannelLoad << 1); - tmp108__ |= (pSrc->NoiseHistogram << 2); - tmp108__ |= (pSrc->statistics << 3); - tmp108__ |= (pSrc->LCIMeasurement << 4); - tmp108__ |= (pSrc->LCIAzimuth << 5); - tmp108__ |= (pSrc->TCMCapability << 6); - tmp108__ |= (pSrc->triggeredTCM << 7); + tmp108__ |= (pSrc->APChanReport << 0); + tmp108__ |= (pSrc->RRMMIBEnabled << 1); + tmp108__ |= (pSrc->operatingChanMax << 2); + tmp108__ |= (pSrc->nonOperatinChanMax << 5); *pBuf = tmp108__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp109__ = 0U; - tmp109__ |= (pSrc->APChanReport << 0); - tmp109__ |= (pSrc->RRMMIBEnabled << 1); - tmp109__ |= (pSrc->operatingChanMax << 2); - tmp109__ |= (pSrc->nonOperatinChanMax << 5); + 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->MeasurementPilot << 0); - tmp110__ |= (pSrc->MeasurementPilotEnabled << 3); - tmp110__ |= (pSrc->NeighborTSFOffset << 4); - tmp110__ |= (pSrc->RCPIMeasurement << 5); - tmp110__ |= (pSrc->RSNIMeasurement << 6); - tmp110__ |= (pSrc->BssAvgAccessDelay << 7); + 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; - pBuf += 1; - nBuf -= 1 ; - tmp111__ = 0U; - tmp111__ |= (pSrc->BSSAvailAdmission << 0); - tmp111__ |= (pSrc->AntennaInformation << 1); - tmp111__ |= (pSrc->fine_time_meas_rpt << 2); - tmp111__ |= (pSrc->lci_capability << 3); - tmp111__ |= (pSrc->reserved << 4); - *pBuf = tmp111__; - *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; break; @@ -17769,7 +17810,7 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp112__; + uint16_t tmp111__; nNeeded += 14; while (pSrc->present) { if (nNeeded > nBuf) @@ -17778,12 +17819,12 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp112__ = 0U; - tmp112__ |= (pSrc->aggregation << 0); - tmp112__ |= (pSrc->tsid << 1); - tmp112__ |= (pSrc->direction << 5); - tmp112__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp112__, 0); + tmp111__ = 0U; + tmp111__ |= (pSrc->aggregation << 0); + tmp111__ |= (pSrc->tsid << 1); + tmp111__ |= (pSrc->direction << 5); + tmp111__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp111__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18010,9 +18051,9 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp113__; - uint8_t tmp114__; - uint16_t tmp115__; + uint16_t tmp112__; + uint8_t tmp113__; + uint16_t tmp114__; nNeeded += 55; while (pSrc->present) { if (nNeeded > nBuf) @@ -18021,30 +18062,30 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp113__ = 0U; - tmp113__ |= (pSrc->traffic_type << 0); - tmp113__ |= (pSrc->tsid << 1); - tmp113__ |= (pSrc->direction << 5); - tmp113__ |= (pSrc->access_policy << 7); - tmp113__ |= (pSrc->aggregation << 9); - tmp113__ |= (pSrc->psb << 10); - tmp113__ |= (pSrc->user_priority << 11); - tmp113__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp113__, 0); + 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); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp114__ = 0U; - tmp114__ |= (pSrc->schedule << 0); - tmp114__ |= (pSrc->unused << 1); - *pBuf = tmp114__; + tmp113__ = 0U; + tmp113__ |= (pSrc->schedule << 0); + tmp113__ |= (pSrc->unused << 1); + *pBuf = tmp113__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp115__ = 0U; - tmp115__ |= (pSrc->size << 0); - tmp115__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp115__, 0); + tmp114__ = 0U; + tmp114__ |= (pSrc->size << 0); + tmp114__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp114__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18108,9 +18149,9 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp116__; + uint32_t tmp115__; + uint16_t tmp116__; uint16_t tmp117__; - uint16_t tmp118__; nNeeded += 12; while (pSrc->present) { if (nNeeded > nBuf) @@ -18119,48 +18160,48 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp116__ = 0U; - tmp116__ |= (pSrc->maxMPDULen << 0); - tmp116__ |= (pSrc->supportedChannelWidthSet << 2); - tmp116__ |= (pSrc->ldpcCodingCap << 4); - tmp116__ |= (pSrc->shortGI80MHz << 5); - tmp116__ |= (pSrc->shortGI160and80plus80MHz << 6); - tmp116__ |= (pSrc->txSTBC << 7); - tmp116__ |= (pSrc->rxSTBC << 8); - tmp116__ |= (pSrc->suBeamFormerCap << 11); - tmp116__ |= (pSrc->suBeamformeeCap << 12); - tmp116__ |= (pSrc->csnofBeamformerAntSup << 13); - tmp116__ |= (pSrc->numSoundingDim << 16); - tmp116__ |= (pSrc->muBeamformerCap << 19); - tmp116__ |= (pSrc->muBeamformeeCap << 20); - tmp116__ |= (pSrc->vhtTXOPPS << 21); - tmp116__ |= (pSrc->htcVHTCap << 22); - tmp116__ |= (pSrc->maxAMPDULenExp << 23); - tmp116__ |= (pSrc->vhtLinkAdaptCap << 26); - tmp116__ |= (pSrc->rxAntPattern << 28); - tmp116__ |= (pSrc->txAntPattern << 29); - tmp116__ |= (pSrc->reserved1 << 30); - frameshtonl(pCtx, pBuf, tmp116__, 0); + 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); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp117__ = 0U; - tmp117__ |= (pSrc->rxHighSupDataRate << 0); - tmp117__ |= (pSrc->reserved2 << 13); - frameshtons(pCtx, pBuf, tmp117__, 0); + tmp116__ = 0U; + tmp116__ |= (pSrc->rxHighSupDataRate << 0); + tmp116__ |= (pSrc->reserved2 << 13); + frameshtons(pCtx, pBuf, tmp116__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp118__ = 0U; - tmp118__ |= (pSrc->txSupDataRate << 0); - tmp118__ |= (pSrc->reserved3 << 13); - frameshtons(pCtx, pBuf, tmp118__, 0); + tmp117__ = 0U; + tmp117__ |= (pSrc->txSupDataRate << 0); + tmp117__ |= (pSrc->reserved3 << 13); + frameshtons(pCtx, pBuf, tmp117__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -18220,7 +18261,7 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp119__; + uint16_t tmp118__; nNeeded += 15; while (pSrc->present) { if (nNeeded > nBuf) @@ -18242,12 +18283,12 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp119__ = 0U; - tmp119__ |= (pSrc->aggregation << 0); - tmp119__ |= (pSrc->tsid << 1); - tmp119__ |= (pSrc->direction << 5); - tmp119__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp119__, 0); + tmp118__ = 0U; + tmp118__ |= (pSrc->aggregation << 0); + tmp118__ |= (pSrc->tsid << 1); + tmp118__ |= (pSrc->direction << 5); + tmp118__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp118__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18481,9 +18522,9 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp120__; - uint8_t tmp121__; - uint16_t tmp122__; + uint16_t tmp119__; + uint8_t tmp120__; + uint16_t tmp121__; nNeeded += 38; while (pSrc->present) { if (nNeeded > nBuf) @@ -18505,30 +18546,30 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp120__ = 0U; - tmp120__ |= (pSrc->traffic_type << 0); - tmp120__ |= (pSrc->tsid << 1); - tmp120__ |= (pSrc->direction << 5); - tmp120__ |= (pSrc->access_policy << 7); - tmp120__ |= (pSrc->aggregation << 9); - tmp120__ |= (pSrc->psb << 10); - tmp120__ |= (pSrc->user_priority << 11); - tmp120__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp120__, 0); + 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); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp121__ = 0U; - tmp121__ |= (pSrc->tsinfo_rsvd << 0); - tmp121__ |= (pSrc->burst_size_defn << 7); - *pBuf = tmp121__; + tmp120__ = 0U; + tmp120__ |= (pSrc->tsinfo_rsvd << 0); + tmp120__ |= (pSrc->burst_size_defn << 7); + *pBuf = tmp120__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp122__ = 0U; - tmp122__ |= (pSrc->size << 0); - tmp122__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp122__, 0); + tmp121__ = 0U; + tmp121__ |= (pSrc->size << 0); + tmp121__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp121__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18685,8 +18726,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 tmp124__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_rpt(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -18701,24 +18742,24 @@ uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp123__ = 0U; - tmp123__ |= (pSrc->APReachability << 0); - tmp123__ |= (pSrc->Security << 2); - tmp123__ |= (pSrc->KeyScope << 3); - tmp123__ |= (pSrc->SpecMgmtCap << 4); - tmp123__ |= (pSrc->QosCap << 5); - tmp123__ |= (pSrc->apsd << 6); - tmp123__ |= (pSrc->rrm << 7); - *pBuf = tmp123__; + 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__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp124__ = 0U; - tmp124__ |= (pSrc->DelayedBA << 0); - tmp124__ |= (pSrc->ImmBA << 1); - tmp124__ |= (pSrc->MobilityDomain << 2); - tmp124__ |= (pSrc->reserved << 3); - *pBuf = tmp124__; + tmp123__ = 0U; + tmp123__ |= (pSrc->DelayedBA << 0); + tmp123__ |= (pSrc->ImmBA << 1); + tmp123__ |= (pSrc->MobilityDomain << 2); + tmp123__ |= (pSrc->reserved << 3); + *pBuf = tmp123__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19081,6 +19122,7 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint8_t tmp124__; uint8_t tmp125__; uint8_t tmp126__; uint8_t tmp127__; @@ -19088,7 +19130,6 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp129__; uint8_t tmp130__; uint8_t tmp131__; - uint8_t tmp132__; nNeeded += 18; while (pSrc->present) { if (nNeeded > nBuf) @@ -19103,76 +19144,76 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; - tmp125__ = 0U; - tmp125__ |= (pSrc->acbe_aifsn << 0); - tmp125__ |= (pSrc->acbe_acm << 4); - tmp125__ |= (pSrc->acbe_aci << 5); - tmp125__ |= (pSrc->unused1 << 7); - *pBuf = tmp125__; + tmp124__ = 0U; + tmp124__ |= (pSrc->acbe_aifsn << 0); + tmp124__ |= (pSrc->acbe_acm << 4); + tmp124__ |= (pSrc->acbe_aci << 5); + tmp124__ |= (pSrc->unused1 << 7); + *pBuf = tmp124__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp126__ = 0U; - tmp126__ |= (pSrc->acbe_acwmin << 0); - tmp126__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp126__; + tmp125__ = 0U; + tmp125__ |= (pSrc->acbe_acwmin << 0); + tmp125__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp125__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp127__ = 0U; - tmp127__ |= (pSrc->acbk_aifsn << 0); - tmp127__ |= (pSrc->acbk_acm << 4); - tmp127__ |= (pSrc->acbk_aci << 5); - tmp127__ |= (pSrc->unused2 << 7); - *pBuf = tmp127__; + tmp126__ = 0U; + tmp126__ |= (pSrc->acbk_aifsn << 0); + tmp126__ |= (pSrc->acbk_acm << 4); + tmp126__ |= (pSrc->acbk_aci << 5); + tmp126__ |= (pSrc->unused2 << 7); + *pBuf = tmp126__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp128__ = 0U; - tmp128__ |= (pSrc->acbk_acwmin << 0); - tmp128__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp128__; + tmp127__ = 0U; + tmp127__ |= (pSrc->acbk_acwmin << 0); + tmp127__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp127__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp129__ = 0U; - tmp129__ |= (pSrc->acvi_aifsn << 0); - tmp129__ |= (pSrc->acvi_acm << 4); - tmp129__ |= (pSrc->acvi_aci << 5); - tmp129__ |= (pSrc->unused3 << 7); - *pBuf = tmp129__; + tmp128__ = 0U; + tmp128__ |= (pSrc->acvi_aifsn << 0); + tmp128__ |= (pSrc->acvi_acm << 4); + tmp128__ |= (pSrc->acvi_aci << 5); + tmp128__ |= (pSrc->unused3 << 7); + *pBuf = tmp128__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp130__ = 0U; - tmp130__ |= (pSrc->acvi_acwmin << 0); - tmp130__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp130__; + tmp129__ = 0U; + tmp129__ |= (pSrc->acvi_acwmin << 0); + tmp129__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp129__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp131__ = 0U; - tmp131__ |= (pSrc->acvo_aifsn << 0); - tmp131__ |= (pSrc->acvo_acm << 4); - tmp131__ |= (pSrc->acvo_aci << 5); - tmp131__ |= (pSrc->unused4 << 7); - *pBuf = tmp131__; + tmp130__ = 0U; + tmp130__ |= (pSrc->acvo_aifsn << 0); + tmp130__ |= (pSrc->acvo_acm << 4); + tmp130__ |= (pSrc->acvo_aci << 5); + tmp130__ |= (pSrc->unused4 << 7); + *pBuf = tmp130__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp132__ = 0U; - tmp132__ |= (pSrc->acvo_acwmin << 0); - tmp132__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp132__; + tmp131__ = 0U; + tmp131__ |= (pSrc->acvo_acwmin << 0); + tmp131__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp131__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19197,7 +19238,7 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp133__; + uint8_t tmp132__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -19206,12 +19247,12 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp133__ = 0U; - tmp133__ |= (pSrc->non_erp_present << 0); - tmp133__ |= (pSrc->use_prot << 1); - tmp133__ |= (pSrc->barker_preamble << 2); - tmp133__ |= (pSrc->unused << 3); - *pBuf = tmp133__; + tmp132__ = 0U; + tmp132__ |= (pSrc->non_erp_present << 0); + tmp132__ |= (pSrc->use_prot << 1); + tmp132__ |= (pSrc->barker_preamble << 2); + tmp132__ |= (pSrc->unused << 3); + *pBuf = tmp132__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -19270,7 +19311,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 tmp134__; + uint8_t tmp133__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -19290,10 +19331,10 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, *pBuf = pSrc->mgmt_state; *pnConsumed += 1; pBuf += 1; - tmp134__ = 0U; - tmp134__ |= (pSrc->mbssid_mask << 0); - tmp134__ |= (pSrc->reserved << 3); - *pBuf = tmp134__; + tmp133__ = 0U; + tmp133__ |= (pSrc->mbssid_mask << 0); + tmp133__ |= (pSrc->reserved << 3); + *pBuf = tmp133__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -19644,7 +19685,7 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp135__; + uint16_t tmp134__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ieft_info(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -19656,10 +19697,10 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; --nBuf; ++(*pnConsumed); - tmp135__ = 0U; - tmp135__ |= (pSrc->reserved << 0); - tmp135__ |= (pSrc->IECount << 8); - frameshtons(pCtx, pBuf, tmp135__, 0); + tmp134__ = 0U; + tmp134__ |= (pSrc->reserved << 0); + tmp134__ |= (pSrc->IECount << 8); + frameshtons(pCtx, pBuf, tmp134__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -19697,11 +19738,11 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp136__; - uint8_t tmp137__; - uint16_t tmp138__; - uint32_t tmp139__; - uint8_t tmp140__; + uint16_t tmp135__; + uint8_t tmp136__; + uint16_t tmp137__; + uint32_t tmp138__; + uint8_t tmp139__; nNeeded += (pSrc->num_rsvd + 26); while (pSrc->present) { if (nNeeded > nBuf) @@ -19710,77 +19751,77 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp136__ = 0U; - tmp136__ |= (pSrc->advCodingCap << 0); - tmp136__ |= (pSrc->supportedChannelWidthSet << 1); - tmp136__ |= (pSrc->mimoPowerSave << 2); - tmp136__ |= (pSrc->greenField << 4); - tmp136__ |= (pSrc->shortGI20MHz << 5); - tmp136__ |= (pSrc->shortGI40MHz << 6); - tmp136__ |= (pSrc->txSTBC << 7); - tmp136__ |= (pSrc->rxSTBC << 8); - tmp136__ |= (pSrc->delayedBA << 10); - tmp136__ |= (pSrc->maximalAMSDUsize << 11); - tmp136__ |= (pSrc->dsssCckMode40MHz << 12); - tmp136__ |= (pSrc->psmp << 13); - tmp136__ |= (pSrc->stbcControlFrame << 14); - tmp136__ |= (pSrc->lsigTXOPProtection << 15); - frameshtons(pCtx, pBuf, tmp136__, 0); + 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); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp137__ = 0U; - tmp137__ |= (pSrc->maxRxAMPDUFactor << 0); - tmp137__ |= (pSrc->mpduDensity << 2); - tmp137__ |= (pSrc->reserved1 << 5); - *pBuf = tmp137__; + tmp136__ = 0U; + tmp136__ |= (pSrc->maxRxAMPDUFactor << 0); + tmp136__ |= (pSrc->mpduDensity << 2); + tmp136__ |= (pSrc->reserved1 << 5); + *pBuf = tmp136__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16); *pnConsumed += 16; pBuf += 16; - tmp138__ = 0U; - tmp138__ |= (pSrc->pco << 0); - tmp138__ |= (pSrc->transitionTime << 1); - tmp138__ |= (pSrc->reserved2 << 3); - tmp138__ |= (pSrc->mcsFeedback << 8); - tmp138__ |= (pSrc->reserved3 << 10); - frameshtons(pCtx, pBuf, tmp138__, 0); + 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); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp139__ = 0U; - tmp139__ |= (pSrc->txBF << 0); - tmp139__ |= (pSrc->rxStaggeredSounding << 1); - tmp139__ |= (pSrc->txStaggeredSounding << 2); - tmp139__ |= (pSrc->rxZLF << 3); - tmp139__ |= (pSrc->txZLF << 4); - tmp139__ |= (pSrc->implicitTxBF << 5); - tmp139__ |= (pSrc->calibration << 6); - tmp139__ |= (pSrc->explicitCSITxBF << 8); - tmp139__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); - tmp139__ |= (pSrc->explicitBFCSIFeedback << 10); - tmp139__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); - tmp139__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); - tmp139__ |= (pSrc->csiNumBFAntennae << 19); - tmp139__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); - tmp139__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); - tmp139__ |= (pSrc->reserved4 << 25); - frameshtonl(pCtx, pBuf, tmp139__, 0); + 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); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp140__ = 0U; - tmp140__ |= (pSrc->antennaSelection << 0); - tmp140__ |= (pSrc->explicitCSIFeedbackTx << 1); - tmp140__ |= (pSrc->antennaIndicesFeedbackTx << 2); - tmp140__ |= (pSrc->explicitCSIFeedback << 3); - tmp140__ |= (pSrc->antennaIndicesFeedback << 4); - tmp140__ |= (pSrc->rxAS << 5); - tmp140__ |= (pSrc->txSoundingPPDUs << 6); - tmp140__ |= (pSrc->reserved5 << 7); - *pBuf = tmp140__; + 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__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19805,9 +19846,9 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp141__; + uint8_t tmp140__; + uint16_t tmp141__; uint16_t tmp142__; - uint16_t tmp143__; nNeeded += (pSrc->num_rsvd + 22); while (pSrc->present) { if (nNeeded > nBuf) @@ -19819,35 +19860,35 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, *pBuf = pSrc->primaryChannel; *pnConsumed += 1; pBuf += 1; - tmp141__ = 0U; - tmp141__ |= (pSrc->secondaryChannelOffset << 0); - tmp141__ |= (pSrc->recommendedTxWidthSet << 2); - tmp141__ |= (pSrc->rifsMode << 3); - tmp141__ |= (pSrc->controlledAccessOnly << 4); - tmp141__ |= (pSrc->serviceIntervalGranularity << 5); - *pBuf = tmp141__; + tmp140__ = 0U; + tmp140__ |= (pSrc->secondaryChannelOffset << 0); + tmp140__ |= (pSrc->recommendedTxWidthSet << 2); + tmp140__ |= (pSrc->rifsMode << 3); + tmp140__ |= (pSrc->controlledAccessOnly << 4); + tmp140__ |= (pSrc->serviceIntervalGranularity << 5); + *pBuf = tmp140__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp142__ = 0U; - tmp142__ |= (pSrc->opMode << 0); - tmp142__ |= (pSrc->nonGFDevicesPresent << 2); - tmp142__ |= (pSrc->transmitBurstLimit << 3); - tmp142__ |= (pSrc->obssNonHTStaPresent << 4); - tmp142__ |= (pSrc->reserved << 5); - frameshtons(pCtx, pBuf, tmp142__, 0); + 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); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp143__ = 0U; - tmp143__ |= (pSrc->basicSTBCMCS << 0); - tmp143__ |= (pSrc->dualCTSProtection << 7); - tmp143__ |= (pSrc->secondaryBeacon << 8); - tmp143__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); - tmp143__ |= (pSrc->pcoActive << 10); - tmp143__ |= (pSrc->pcoPhase << 11); - tmp143__ |= (pSrc->reserved2 << 12); - frameshtons(pCtx, pBuf, tmp143__, 0); + 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); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -19987,9 +20028,9 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint8_t tmp143__; uint8_t tmp144__; uint8_t tmp145__; - uint8_t tmp146__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20004,12 +20045,12 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, *pBuf = pSrc->token; *pnConsumed += 1; pBuf += 1; - tmp144__ = 0U; - tmp144__ |= (pSrc->late << 0); - tmp144__ |= (pSrc->incapable << 1); - tmp144__ |= (pSrc->refused << 2); - tmp144__ |= (pSrc->unused << 3); - *pBuf = tmp144__; + tmp143__ = 0U; + tmp143__ |= (pSrc->late << 0); + tmp143__ |= (pSrc->incapable << 1); + tmp143__ |= (pSrc->refused << 2); + tmp143__ |= (pSrc->unused << 3); + *pBuf = tmp143__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20028,14 +20069,14 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp145__ = 0U; - tmp145__ |= (pSrc->report.Basic.bss << 0); - tmp145__ |= (pSrc->report.Basic.ofdm_preamble << 1); - tmp145__ |= (pSrc->report.Basic.unid_signal << 2); - tmp145__ |= (pSrc->report.Basic.rader << 3); - tmp145__ |= (pSrc->report.Basic.unmeasured << 4); - tmp145__ |= (pSrc->report.Basic.unused << 5); - *pBuf = tmp145__; + 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__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20102,10 +20143,10 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp146__ = 0U; - tmp146__ |= (pSrc->report.Beacon.condensed_PHY << 0); - tmp146__ |= (pSrc->report.Beacon.reported_frame_type << 7); - *pBuf = tmp146__; + tmp145__ = 0U; + tmp145__ |= (pSrc->report.Beacon.condensed_PHY << 0); + tmp145__ |= (pSrc->report.Beacon.reported_frame_type << 7); + *pBuf = tmp145__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20154,7 +20195,7 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp147__; + uint8_t tmp146__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_request(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20169,14 +20210,14 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, *pBuf = pSrc->measurement_token; *pnConsumed += 1; pBuf += 1; - tmp147__ = 0U; - tmp147__ |= (pSrc->parallel << 0); - tmp147__ |= (pSrc->enable << 1); - tmp147__ |= (pSrc->request << 2); - tmp147__ |= (pSrc->report << 3); - tmp147__ |= (pSrc->durationMandatory << 4); - tmp147__ |= (pSrc->unused << 5); - *pBuf = tmp147__; + 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__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20290,7 +20331,7 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp148__; + uint8_t tmp147__; nNeeded += 3; while (pSrc->present) { if (nNeeded > nBuf) @@ -20302,11 +20343,11 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->MDID, 0); *pnConsumed += 2; pBuf += 2; - tmp148__ = 0U; - tmp148__ |= (pSrc->overDSCap << 0); - tmp148__ |= (pSrc->resourceReqCap << 1); - tmp148__ |= (pSrc->reserved << 2); - *pBuf = tmp148__; + tmp147__ = 0U; + tmp147__ |= (pSrc->overDSCap << 0); + tmp147__ |= (pSrc->resourceReqCap << 1); + tmp147__ |= (pSrc->reserved << 2); + *pBuf = tmp147__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20328,8 +20369,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 tmp150__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20344,24 +20385,24 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp149__ = 0U; - tmp149__ |= (pSrc->APReachability << 0); - tmp149__ |= (pSrc->Security << 2); - tmp149__ |= (pSrc->KeyScope << 3); - tmp149__ |= (pSrc->SpecMgmtCap << 4); - tmp149__ |= (pSrc->QosCap << 5); - tmp149__ |= (pSrc->apsd << 6); - tmp149__ |= (pSrc->rrm << 7); - *pBuf = tmp149__; + 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__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp150__ = 0U; - tmp150__ |= (pSrc->DelayedBA << 0); - tmp150__ |= (pSrc->ImmBA << 1); - tmp150__ |= (pSrc->MobilityDomain << 2); - tmp150__ |= (pSrc->reserved << 3); - *pBuf = tmp150__; + tmp149__ = 0U; + tmp149__ |= (pSrc->DelayedBA << 0); + tmp149__ |= (pSrc->ImmBA << 1); + tmp149__ |= (pSrc->MobilityDomain << 2); + tmp149__ |= (pSrc->reserved << 3); + *pBuf = tmp149__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20449,7 +20490,7 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp151__; + uint8_t tmp150__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -20458,12 +20499,12 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp151__ = 0U; - tmp151__ |= (pSrc->chanWidth << 0); - tmp151__ |= (pSrc->reserved << 2); - tmp151__ |= (pSrc->rxNSS << 4); - tmp151__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp151__; + tmp150__ = 0U; + tmp150__ |= (pSrc->chanWidth << 0); + tmp150__ |= (pSrc->reserved << 2); + tmp150__ |= (pSrc->rxNSS << 4); + tmp150__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp150__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20938,7 +20979,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 tmp152__; + uint8_t tmp151__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -20947,13 +20988,13 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp152__ = 0U; - tmp152__ |= (pSrc->ac_bk_traffic_aval << 0); - tmp152__ |= (pSrc->ac_be_traffic_aval << 1); - tmp152__ |= (pSrc->ac_vi_traffic_aval << 2); - tmp152__ |= (pSrc->ac_vo_traffic_aval << 3); - tmp152__ |= (pSrc->reserved << 4); - *pBuf = tmp152__; + 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__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21146,7 +21187,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 tmp153__; + uint8_t tmp152__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -21155,13 +21196,13 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp153__ = 0U; - tmp153__ |= (pSrc->count << 0); - tmp153__ |= (pSrc->qack << 4); - tmp153__ |= (pSrc->qreq << 5); - tmp153__ |= (pSrc->txopreq << 6); - tmp153__ |= (pSrc->reserved << 7); - *pBuf = tmp153__; + tmp152__ = 0U; + tmp152__ |= (pSrc->count << 0); + tmp152__ |= (pSrc->qack << 4); + tmp152__ |= (pSrc->qreq << 5); + tmp152__ |= (pSrc->txopreq << 6); + tmp152__ |= (pSrc->reserved << 7); + *pBuf = tmp152__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21183,7 +21224,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 tmp154__; + uint8_t tmp153__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -21192,15 +21233,15 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp154__ = 0U; - tmp154__ |= (pSrc->acvo_uapsd << 0); - tmp154__ |= (pSrc->acvi_uapsd << 1); - tmp154__ |= (pSrc->acbk_uapsd << 2); - tmp154__ |= (pSrc->acbe_uapsd << 3); - tmp154__ |= (pSrc->qack << 4); - tmp154__ |= (pSrc->max_sp_length << 5); - tmp154__ |= (pSrc->more_data_ack << 7); - *pBuf = tmp154__; + 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__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21837,7 +21878,7 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp155__; + uint16_t tmp154__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_iewapi(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -21867,10 +21908,10 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4); *pnConsumed += 4; pBuf += 4; - tmp155__ = 0U; - tmp155__ |= (pSrc->preauth << 0); - tmp155__ |= (pSrc->reserved << 1); - frameshtons(pCtx, pBuf, tmp155__, 0); + tmp154__ = 0U; + tmp154__ |= (pSrc->preauth << 0); + tmp154__ |= (pSrc->reserved << 1); + frameshtons(pCtx, pBuf, tmp154__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -22010,7 +22051,7 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp156__; + uint8_t tmp155__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22032,13 +22073,13 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp156__ = 0U; - tmp156__ |= (pSrc->reserved << 0); - tmp156__ |= (pSrc->qack << 4); - tmp156__ |= (pSrc->queue_request << 5); - tmp156__ |= (pSrc->txop_request << 6); - tmp156__ |= (pSrc->more_ack << 7); - *pBuf = tmp156__; + 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__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -22056,6 +22097,54 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, uint8_t *pBuf, uint32_t nBuf, uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + uint8_t tmp156__; + nNeeded += 2; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 221; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x50; + ++pBuf; ++(*pnConsumed); + *pBuf = 0xf2; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x2; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *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__; + *pnConsumed += 1; + /* fieldsEndFlag = 1 */ + nBuf -= 1 ; + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_wmm_info_ap. */ + +uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, + tDot11fIEWMMInfoStation *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) { uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; @@ -22083,9 +22172,13 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; tmp157__ = 0U; - tmp157__ |= (pSrc->param_set_count << 0); - tmp157__ |= (pSrc->reserved << 4); - tmp157__ |= (pSrc->uapsd << 7); + 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__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ @@ -22097,58 +22190,6 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, *pIeLen = *pnConsumed - nConsumedOnEntry - 2; } return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_wmm_info_ap. */ - -uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, - tDot11fIEWMMInfoStation *pSrc, - uint8_t *pBuf, - uint32_t nBuf, - uint32_t *pnConsumed) -{ - uint8_t *pIeLen = 0; - uint32_t nConsumedOnEntry = *pnConsumed; - uint32_t nNeeded = 0U; - uint8_t tmp158__; - nNeeded += 2; - while (pSrc->present) { - if (nNeeded > nBuf) - return DOT11F_BUFFER_OVERFLOW; - *pBuf = 221; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x50; - ++pBuf; ++(*pnConsumed); - *pBuf = 0xf2; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x2; - ++pBuf; ++(*pnConsumed); - *pBuf = 0x0; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->version; - *pnConsumed += 1; - pBuf += 1; - tmp158__ = 0U; - tmp158__ |= (pSrc->acvo_uapsd << 0); - tmp158__ |= (pSrc->acvi_uapsd << 1); - tmp158__ |= (pSrc->acbk_uapsd << 2); - tmp158__ |= (pSrc->acbe_uapsd << 3); - tmp158__ |= (pSrc->reserved1 << 4); - tmp158__ |= (pSrc->max_sp_length << 5); - tmp158__ |= (pSrc->reserved2 << 7); - *pBuf = tmp158__; - *pnConsumed += 1; - /* fieldsEndFlag = 1 */ - nBuf -= 1 ; - break; - } - (void)pCtx; - if (pIeLen) { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_wmm_info_station. */ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, @@ -22160,6 +22201,7 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; + uint8_t tmp158__; uint8_t tmp159__; uint8_t tmp160__; uint8_t tmp161__; @@ -22167,7 +22209,6 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t tmp163__; uint8_t tmp164__; uint8_t tmp165__; - uint8_t tmp166__; nNeeded += 19; while (pSrc->present) { if (nNeeded > nBuf) @@ -22195,76 +22236,76 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved2; *pnConsumed += 1; pBuf += 1; - tmp159__ = 0U; - tmp159__ |= (pSrc->acbe_aifsn << 0); - tmp159__ |= (pSrc->acbe_acm << 4); - tmp159__ |= (pSrc->acbe_aci << 5); - tmp159__ |= (pSrc->unused1 << 7); - *pBuf = tmp159__; + tmp158__ = 0U; + tmp158__ |= (pSrc->acbe_aifsn << 0); + tmp158__ |= (pSrc->acbe_acm << 4); + tmp158__ |= (pSrc->acbe_aci << 5); + tmp158__ |= (pSrc->unused1 << 7); + *pBuf = tmp158__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp160__ = 0U; - tmp160__ |= (pSrc->acbe_acwmin << 0); - tmp160__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp160__; + tmp159__ = 0U; + tmp159__ |= (pSrc->acbe_acwmin << 0); + tmp159__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp159__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp161__ = 0U; - tmp161__ |= (pSrc->acbk_aifsn << 0); - tmp161__ |= (pSrc->acbk_acm << 4); - tmp161__ |= (pSrc->acbk_aci << 5); - tmp161__ |= (pSrc->unused2 << 7); - *pBuf = tmp161__; + tmp160__ = 0U; + tmp160__ |= (pSrc->acbk_aifsn << 0); + tmp160__ |= (pSrc->acbk_acm << 4); + tmp160__ |= (pSrc->acbk_aci << 5); + tmp160__ |= (pSrc->unused2 << 7); + *pBuf = tmp160__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp162__ = 0U; - tmp162__ |= (pSrc->acbk_acwmin << 0); - tmp162__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp162__; + tmp161__ = 0U; + tmp161__ |= (pSrc->acbk_acwmin << 0); + tmp161__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp161__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp163__ = 0U; - tmp163__ |= (pSrc->acvi_aifsn << 0); - tmp163__ |= (pSrc->acvi_acm << 4); - tmp163__ |= (pSrc->acvi_aci << 5); - tmp163__ |= (pSrc->unused3 << 7); - *pBuf = tmp163__; + tmp162__ = 0U; + tmp162__ |= (pSrc->acvi_aifsn << 0); + tmp162__ |= (pSrc->acvi_acm << 4); + tmp162__ |= (pSrc->acvi_aci << 5); + tmp162__ |= (pSrc->unused3 << 7); + *pBuf = tmp162__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp164__ = 0U; - tmp164__ |= (pSrc->acvi_acwmin << 0); - tmp164__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp164__; + tmp163__ = 0U; + tmp163__ |= (pSrc->acvi_acwmin << 0); + tmp163__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp163__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp165__ = 0U; - tmp165__ |= (pSrc->acvo_aifsn << 0); - tmp165__ |= (pSrc->acvo_acm << 4); - tmp165__ |= (pSrc->acvo_aci << 5); - tmp165__ |= (pSrc->unused4 << 7); - *pBuf = tmp165__; + tmp164__ = 0U; + tmp164__ |= (pSrc->acvo_aifsn << 0); + tmp164__ |= (pSrc->acvo_acm << 4); + tmp164__ |= (pSrc->acvo_aci << 5); + tmp164__ |= (pSrc->unused4 << 7); + *pBuf = tmp164__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp166__ = 0U; - tmp166__ |= (pSrc->acvo_acwmin << 0); - tmp166__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp166__; + tmp165__ = 0U; + tmp165__ |= (pSrc->acvo_acwmin << 0); + tmp165__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp165__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -22821,7 +22862,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 tmp167__; + uint8_t tmp166__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22841,10 +22882,10 @@ uint32_t dot11f_pack_ie_bss_color_change(tpAniSirGlobal pCtx, *pBuf = pSrc->countdown; *pnConsumed += 1; pBuf += 1; - tmp167__ = 0U; - tmp167__ |= (pSrc->new_color << 0); - tmp167__ |= (pSrc->reserved << 6); - *pBuf = tmp167__; + tmp166__ = 0U; + tmp166__ |= (pSrc->new_color << 0); + tmp166__ |= (pSrc->reserved << 6); + *pBuf = tmp166__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -23003,7 +23044,7 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp168__; + uint16_t tmp167__; nNeeded += (pSrc->num_variable_data + 2); while (pSrc->present) { if (nNeeded > nBuf) @@ -23012,17 +23053,17 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp168__ = 0U; - tmp168__ |= (pSrc->public_key_identifiers_cnt << 0); - tmp168__ |= (pSrc->realm_identifiers_cnt << 3); - tmp168__ |= (pSrc->is_ip_config_supported << 6); - tmp168__ |= (pSrc->is_cache_id_present << 7); - tmp168__ |= (pSrc->is_hessid_present << 8); - tmp168__ |= (pSrc->is_fils_sk_auth_supported << 9); - tmp168__ |= (pSrc->is_fils_sk_auth_pfs_supported << 10); - tmp168__ |= (pSrc->is_pk_auth_supported << 11); - tmp168__ |= (pSrc->reserved << 12); - frameshtons(pCtx, pBuf, tmp168__, 0); + 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); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -23268,12 +23309,11 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp169__; - uint8_t tmp170__; + uint32_t tmp168__; + uint8_t tmp169__; + uint32_t tmp170__; uint32_t tmp171__; - uint32_t tmp172__; - uint8_t tmp173__; - uint16_t tmp174__; + uint8_t tmp172__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_cap(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23287,106 +23327,121 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); *pBuf = 35; ++pBuf; --nBuf; ++(*pnConsumed); - tmp169__ = 0U; - tmp169__ |= (pSrc->htc_he << 0); - tmp169__ |= (pSrc->twt_request << 1); - tmp169__ |= (pSrc->twt_responder << 2); - tmp169__ |= (pSrc->fragmentation << 3); - tmp169__ |= (pSrc->max_num_frag_msdu << 5); - tmp169__ |= (pSrc->min_frag_size << 8); - tmp169__ |= (pSrc->trigger_frm_mac_pad << 10); - tmp169__ |= (pSrc->multi_tid_aggr << 12); - tmp169__ |= (pSrc->he_link_adaptation << 15); - tmp169__ |= (pSrc->all_ack << 17); - tmp169__ |= (pSrc->ul_mu_rsp_sched << 18); - tmp169__ |= (pSrc->a_bsr << 19); - tmp169__ |= (pSrc->broadcast_twt << 20); - tmp169__ |= (pSrc->ba_32bit_bitmap << 21); - tmp169__ |= (pSrc->mu_cascade << 22); - tmp169__ |= (pSrc->ack_enabled_multitid << 23); - tmp169__ |= (pSrc->dl_mu_ba << 24); - tmp169__ |= (pSrc->omi_a_ctrl << 25); - tmp169__ |= (pSrc->ofdma_ra << 26); - tmp169__ |= (pSrc->max_ampdu_len << 27); - tmp169__ |= (pSrc->amsdu_frag << 29); - tmp169__ |= (pSrc->flex_twt_sched << 30); - tmp169__ |= (pSrc->rx_ctrl_frame << 31); - frameshtonl(pCtx, pBuf, tmp169__, 0); + 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); + frameshtonl(pCtx, pBuf, tmp168__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp170__ = 0U; - tmp170__ |= (pSrc->bsrp_ampdu_aggr << 0); - tmp170__ |= (pSrc->qtp << 1); - tmp170__ |= (pSrc->a_bqr << 2); - tmp170__ |= (pSrc->sr_responder << 3); - tmp170__ |= (pSrc->ndp_feedback_supp << 4); - tmp170__ |= (pSrc->ops_supp << 5); - tmp170__ |= (pSrc->reserved1 << 6); - *pBuf = tmp170__; + 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->reserved1 << 6); + *pBuf = tmp169__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + 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->reserved << 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->dual_band << 0); - tmp171__ |= (pSrc->chan_width << 1); - tmp171__ |= (pSrc->rx_pream_puncturing << 8); - tmp171__ |= (pSrc->device_class << 12); - tmp171__ |= (pSrc->ldpc_coding << 13); - tmp171__ |= (pSrc->he_1x_ltf_800_gi_ppdu << 14); - tmp171__ |= (pSrc->reserved << 15); - tmp171__ |= (pSrc->he_4x_ltf_3200_gi_ndp << 17); - tmp171__ |= (pSrc->stbc_lt_80mhz << 18); - tmp171__ |= (pSrc->doppler << 20); - tmp171__ |= (pSrc->ul_mu << 22); - tmp171__ |= (pSrc->dcm_enc_tx << 24); - tmp171__ |= (pSrc->dcm_enc_rx << 27); - tmp171__ |= (pSrc->ul_he_mu << 30); - tmp171__ |= (pSrc->su_beamformer << 31); + 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->su_beamformee << 0); - tmp172__ |= (pSrc->mu_beamformer << 1); - tmp172__ |= (pSrc->bfee_sts_lt_80 << 2); - tmp172__ |= (pSrc->bfee_sts_gt_80 << 5); - tmp172__ |= (pSrc->num_sounding_lt_80 << 8); - tmp172__ |= (pSrc->num_sounding_gt_80 << 11); - tmp172__ |= (pSrc->su_feedback_tone16 << 14); - tmp172__ |= (pSrc->mu_feedback_tone16 << 15); - tmp172__ |= (pSrc->codebook_su << 16); - tmp172__ |= (pSrc->codebook_mu << 17); - tmp172__ |= (pSrc->beamforming_feedback << 18); - tmp172__ |= (pSrc->he_er_su_ppdu << 21); - tmp172__ |= (pSrc->dl_mu_mimo_part_bw << 22); - tmp172__ |= (pSrc->ppet_present << 23); - tmp172__ |= (pSrc->srp << 24); - tmp172__ |= (pSrc->power_boost << 25); - tmp172__ |= (pSrc->he_ltf_800_gi_4x << 26); - tmp172__ |= (pSrc->max_nc << 27); - tmp172__ |= (pSrc->stbc_gt_80mhz << 30); - frameshtonl(pCtx, pBuf, tmp172__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; - tmp173__ = 0U; - tmp173__ |= (pSrc->er_he_ltf_800_gi_4x << 0); - tmp173__ |= (pSrc->reserved2 << 1); - *pBuf = tmp173__; + tmp172__ |= (pSrc->er_he_ltf_800_gi_4x << 0); + tmp172__ |= (pSrc->reserved2 << 1); + *pBuf = tmp172__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp174__ = 0U; - tmp174__ |= (pSrc->nss_supported << 0); - tmp174__ |= (pSrc->mcs_supported << 3); - tmp174__ |= (pSrc->tx_bw_bitmap << 6); - tmp174__ |= (pSrc->rx_bw_bitmap << 11); - frameshtons(pCtx, pBuf, tmp174__, 0); + frameshtons(pCtx, pBuf, pSrc->rx_he_mcs_map_lt_80, 0); *pnConsumed += 2; pBuf += 2; - nBuf -= 2 ; + frameshtons(pCtx, pBuf, pSrc->tx_he_mcs_map_lt_80, 0); + *pnConsumed += 2; + pBuf += 2; + DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->rx_he_mcs_map_160), (pSrc->chan_width_2 * 2)); + *pnConsumed += (pSrc->chan_width_2 * 2); + pBuf += (pSrc->chan_width_2 * 2); + DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->tx_he_mcs_map_160), (pSrc->chan_width_2 * 2)); + *pnConsumed += (pSrc->chan_width_2 * 2); + pBuf += (pSrc->chan_width_2 * 2); + DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->rx_he_mcs_map_80_80), (pSrc->chan_width_3 * 2)); + *pnConsumed += (pSrc->chan_width_3 * 2); + pBuf += (pSrc->chan_width_3 * 2); + 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, @@ -23412,7 +23467,7 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp175__; + uint32_t tmp173__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_op(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23426,19 +23481,19 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 36; ++pBuf; ++(*pnConsumed); - tmp175__ = 0U; - tmp175__ |= (pSrc->bss_color << 0); - tmp175__ |= (pSrc->default_pe << 6); - tmp175__ |= (pSrc->twt_required << 9); - tmp175__ |= (pSrc->rts_threshold << 10); - tmp175__ |= (pSrc->partial_bss_col << 20); - tmp175__ |= (pSrc->vht_oper_present << 21); - tmp175__ |= (pSrc->reserved1 << 22); - tmp175__ |= (pSrc->mbssid_ap << 28); - tmp175__ |= (pSrc->tx_bssid_ind << 29); - tmp175__ |= (pSrc->bss_col_disabled << 30); - tmp175__ |= (pSrc->reserved2 << 31); - frameshtonl(pCtx, pBuf, tmp175__, 0); + 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); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; @@ -23491,7 +23546,7 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp176__; + uint8_t tmp174__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_hs20vendor_ie(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23511,12 +23566,12 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 0x10; ++pBuf; ++(*pnConsumed); - tmp176__ = 0U; - tmp176__ |= (pSrc->dgaf_dis << 0); - tmp176__ |= (pSrc->hs_id_present << 1); - tmp176__ |= (pSrc->reserved << 3); - tmp176__ |= (pSrc->release_num << 4); - *pBuf = tmp176__; + tmp174__ = 0U; + tmp174__ |= (pSrc->dgaf_dis << 0); + tmp174__ |= (pSrc->hs_id_present << 1); + tmp174__ |= (pSrc->reserved << 3); + tmp174__ |= (pSrc->release_num << 4); + *pBuf = tmp174__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -23554,7 +23609,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 tmp177__; + uint8_t tmp175__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -23563,14 +23618,14 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp177__ = 0U; - tmp177__ |= (pSrc->info_request << 0); - tmp177__ |= (pSrc->forty_mhz_intolerant << 1); - tmp177__ |= (pSrc->twenty_mhz_bsswidth_req << 2); - tmp177__ |= (pSrc->obss_scan_exemption_req << 3); - tmp177__ |= (pSrc->obss_scan_exemption_grant << 4); - tmp177__ |= (pSrc->unused << 5); - *pBuf = tmp177__; + 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__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -23624,14 +23679,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 tmp176__; + uint8_t tmp177__; uint8_t tmp178__; uint8_t tmp179__; uint8_t tmp180__; uint8_t tmp181__; uint8_t tmp182__; uint8_t tmp183__; - uint8_t tmp184__; - uint8_t tmp185__; nNeeded += 13; while (pSrc->present) { if (nNeeded > nBuf) @@ -23651,76 +23706,76 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->qos; *pnConsumed += 1; pBuf += 1; - tmp178__ = 0U; - tmp178__ |= (pSrc->acbe_aifsn << 0); - tmp178__ |= (pSrc->acbe_acm << 4); - tmp178__ |= (pSrc->acbe_aci << 5); - tmp178__ |= (pSrc->unused1 << 7); - *pBuf = tmp178__; + tmp176__ = 0U; + tmp176__ |= (pSrc->acbe_aifsn << 0); + tmp176__ |= (pSrc->acbe_acm << 4); + tmp176__ |= (pSrc->acbe_aci << 5); + tmp176__ |= (pSrc->unused1 << 7); + *pBuf = tmp176__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp179__ = 0U; - tmp179__ |= (pSrc->acbe_acwmin << 0); - tmp179__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp179__; + tmp177__ = 0U; + tmp177__ |= (pSrc->acbe_acwmin << 0); + tmp177__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp177__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acbe_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp180__ = 0U; - tmp180__ |= (pSrc->acbk_aifsn << 0); - tmp180__ |= (pSrc->acbk_acm << 4); - tmp180__ |= (pSrc->acbk_aci << 5); - tmp180__ |= (pSrc->unused2 << 7); - *pBuf = tmp180__; + tmp178__ = 0U; + tmp178__ |= (pSrc->acbk_aifsn << 0); + tmp178__ |= (pSrc->acbk_acm << 4); + tmp178__ |= (pSrc->acbk_aci << 5); + tmp178__ |= (pSrc->unused2 << 7); + *pBuf = tmp178__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp181__ = 0U; - tmp181__ |= (pSrc->acbk_acwmin << 0); - tmp181__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp181__; + tmp179__ = 0U; + tmp179__ |= (pSrc->acbk_acwmin << 0); + tmp179__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp179__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acbk_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp182__ = 0U; - tmp182__ |= (pSrc->acvi_aifsn << 0); - tmp182__ |= (pSrc->acvi_acm << 4); - tmp182__ |= (pSrc->acvi_aci << 5); - tmp182__ |= (pSrc->unused3 << 7); - *pBuf = tmp182__; + tmp180__ = 0U; + tmp180__ |= (pSrc->acvi_aifsn << 0); + tmp180__ |= (pSrc->acvi_acm << 4); + tmp180__ |= (pSrc->acvi_aci << 5); + tmp180__ |= (pSrc->unused3 << 7); + *pBuf = tmp180__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp183__ = 0U; - tmp183__ |= (pSrc->acvi_acwmin << 0); - tmp183__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp183__; + tmp181__ = 0U; + tmp181__ |= (pSrc->acvi_acwmin << 0); + tmp181__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp181__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acvi_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp184__ = 0U; - tmp184__ |= (pSrc->acvo_aifsn << 0); - tmp184__ |= (pSrc->acvo_acm << 4); - tmp184__ |= (pSrc->acvo_aci << 5); - tmp184__ |= (pSrc->unused4 << 7); - *pBuf = tmp184__; + tmp182__ = 0U; + tmp182__ |= (pSrc->acvo_aifsn << 0); + tmp182__ |= (pSrc->acvo_acm << 4); + tmp182__ |= (pSrc->acvo_aci << 5); + tmp182__ |= (pSrc->unused4 << 7); + *pBuf = tmp182__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp185__ = 0U; - tmp185__ |= (pSrc->acvo_acwmin << 0); - tmp185__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp185__; + tmp183__ = 0U; + tmp183__ |= (pSrc->acvo_acwmin << 0); + tmp183__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp183__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ;