From aab85cb2177b7721f3720690136b97a4474635b0 Mon Sep 17 00:00:00 2001 From: Deeksha Gupta Date: Mon, 28 Mar 2022 12:23:14 +0530 Subject: [PATCH] qcacld-3.0: update EHT capabilities IE as per draft 1.4 Update dot11f EHT capabilities IE definitions as per 11be draft 1.4 specification. Change-Id: I61493035c6d04658abcd51e53abb1266c2316d46 CRs-Fixed: 3160526 --- core/mac/src/cfg/cfgUtil/dot11f.frms | 7 +- core/mac/src/include/dot11f.h | 11 +- .../mac/src/sys/legacy/src/utils/src/dot11f.c | 2725 +++++++++-------- 3 files changed, 1388 insertions(+), 1355 deletions(-) diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms index 03f94ccb08..66625c1452 100644 --- a/core/mac/src/cfg/cfgUtil/dot11f.frms +++ b/core/mac/src/cfg/cfgUtil/dot11f.frms @@ -3273,7 +3273,7 @@ IE he_6ghz_band_cap (EID_EXTN_ID_ELEMENT) OUI (0x3B) IE eht_cap (EID_EXTN_ID_ELEMENT) OUI (0x6C) { { - nsep_pri_access: 1; + epcs_pri_access: 1; eht_om_ctl: 1; triggered_txop_sharing_mode1: 1; triggered_txop_sharing_mode2: 1; @@ -3327,6 +3327,11 @@ IE eht_cap (EID_EXTN_ID_ELEMENT) OUI (0x6C) mu_bformer_320mhz: 1; tb_sounding_feedback_rl: 1; } + { + rx_1k_qam_in_wider_bw_dl_ofdma: 1; + rx_4k_qam_in_wider_bw_dl_ofdma: 1; + reserved3: 6; + } { bw_20_rx_max_nss_for_mcs_0_to_7: 4; bw_20_tx_max_nss_for_mcs_0_to_7: 4; diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index 355a65ff3f..09abbcd5b1 100644 --- a/core/mac/src/include/dot11f.h +++ b/core/mac/src/include/dot11f.h @@ -27,7 +27,7 @@ * * * This file was automatically generated by 'framesc' - * Fri Mar 25 13:04:34 2022 from the following file(s): + * Mon Mar 28 16:36:01 2022 from the following file(s): * * dot11f.frms * @@ -8818,7 +8818,7 @@ uint32_t dot11f_get_packed_ie_dh_parameter_element( /* EID 255 (0xff) Extended EID 108 (0x6c) */ typedef struct sDot11fIEeht_cap { uint8_t present; - uint16_t nsep_pri_access:1; + uint16_t epcs_pri_access:1; uint16_t eht_om_ctl:1; uint16_t triggered_txop_sharing_mode1:1; uint16_t triggered_txop_sharing_mode2:1; @@ -8867,6 +8867,9 @@ typedef struct sDot11fIEeht_cap { uint32_t mu_bformer_160mhz:1; uint32_t mu_bformer_320mhz:1; uint32_t tb_sounding_feedback_rl:1; + uint8_t rx_1k_qam_in_wider_bw_dl_ofdma:1; + uint8_t rx_4k_qam_in_wider_bw_dl_ofdma:1; + uint8_t reserved3:6; uint32_t bw_20_rx_max_nss_for_mcs_0_to_7:4; uint32_t bw_20_tx_max_nss_for_mcs_0_to_7:4; uint32_t bw_20_rx_max_nss_for_mcs_8_and_9:4; @@ -8904,9 +8907,9 @@ typedef struct sDot11fIEeht_cap { #define DOT11F_EID_EHT_CAP (255) /* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_EHT_CAP_MIN_LEN (23) +#define DOT11F_IE_EHT_CAP_MIN_LEN (24) -#define DOT11F_IE_EHT_CAP_MAX_LEN (85) +#define DOT11F_IE_EHT_CAP_MAX_LEN (86) #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 f81e069317..5491650c59 100644 --- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c +++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c @@ -25,7 +25,7 @@ * * * This file was automatically generated by 'framesc' - * Fri Mar 25 13:04:34 2022 from the following file(s): + * Mon Mar 28 16:36:01 2022 from the following file(s): * * dot11f.frms * @@ -8640,10 +8640,11 @@ uint32_t dot11f_unpack_ie_eht_cap(tpAniSirGlobal pCtx, uint16_t tmp78__; uint32_t tmp79__; uint32_t tmp80__; - uint32_t tmp81__; + uint8_t tmp81__; uint32_t tmp82__; uint32_t tmp83__; - uint8_t tmp84__; + uint32_t tmp84__; + uint8_t tmp85__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -8656,7 +8657,7 @@ uint32_t dot11f_unpack_ie_eht_cap(tpAniSirGlobal pCtx, framesntohs(pCtx, &tmp78__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->nsep_pri_access = tmp78__ >> 0 & 0x1; + pDst->epcs_pri_access = tmp78__ >> 0 & 0x1; pDst->eht_om_ctl = tmp78__ >> 1 & 0x1; pDst->triggered_txop_sharing_mode1 = tmp78__ >> 2 & 0x1; pDst->triggered_txop_sharing_mode2 = tmp78__ >> 3 & 0x1; @@ -8721,22 +8722,17 @@ uint32_t dot11f_unpack_ie_eht_cap(tpAniSirGlobal pCtx, pDst->mu_bformer_160mhz = tmp80__ >> 29 & 0x1; pDst->mu_bformer_320mhz = tmp80__ >> 30 & 0x1; pDst->tb_sounding_feedback_rl = tmp80__ >> 31 & 0x1; - if (unlikely(ielen < 4)) { + if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - framesntohl(pCtx, &tmp81__, pBuf, 0); - pBuf += 4; - ielen -= 4; - pDst->bw_20_rx_max_nss_for_mcs_0_to_7 = tmp81__ >> 0 & 0xf; - pDst->bw_20_tx_max_nss_for_mcs_0_to_7 = tmp81__ >> 4 & 0xf; - pDst->bw_20_rx_max_nss_for_mcs_8_and_9 = tmp81__ >> 8 & 0xf; - pDst->bw_20_tx_max_nss_for_mcs_8_and_9 = tmp81__ >> 12 & 0xf; - pDst->bw_20_rx_max_nss_for_mcs_10_and_11 = tmp81__ >> 16 & 0xf; - pDst->bw_20_tx_max_nss_for_mcs_10_and_11 = tmp81__ >> 20 & 0xf; - pDst->bw_20_rx_max_nss_for_mcs_12_and_13 = tmp81__ >> 24 & 0xf; - pDst->bw_20_tx_max_nss_for_mcs_12_and_13 = tmp81__ >> 28 & 0xf; + tmp81__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->rx_1k_qam_in_wider_bw_dl_ofdma = tmp81__ >> 0 & 0x1; + pDst->rx_4k_qam_in_wider_bw_dl_ofdma = tmp81__ >> 1 & 0x1; + pDst->reserved3 = tmp81__ >> 2 & 0x3f; if (unlikely(ielen < 4)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -8745,14 +8741,14 @@ uint32_t dot11f_unpack_ie_eht_cap(tpAniSirGlobal pCtx, framesntohl(pCtx, &tmp82__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->bw_le_80_rx_max_nss_for_mcs_0_to_9 = tmp82__ >> 0 & 0xf; - pDst->bw_le_80_tx_max_nss_for_mcs_0_to_9 = tmp82__ >> 4 & 0xf; - pDst->bw_le_80_rx_max_nss_for_mcs_10_and_11 = tmp82__ >> 8 & 0xf; - pDst->bw_le_80_tx_max_nss_for_mcs_10_and_11 = tmp82__ >> 12 & 0xf; - pDst->bw_le_80_rx_max_nss_for_mcs_12_and_13 = tmp82__ >> 16 & 0xf; - pDst->bw_le_80_tx_max_nss_for_mcs_12_and_13 = tmp82__ >> 20 & 0xf; - pDst->bw_160_rx_max_nss_for_mcs_0_to_9 = tmp82__ >> 24 & 0xf; - pDst->bw_160_tx_max_nss_for_mcs_0_to_9 = tmp82__ >> 28 & 0xf; + pDst->bw_20_rx_max_nss_for_mcs_0_to_7 = tmp82__ >> 0 & 0xf; + pDst->bw_20_tx_max_nss_for_mcs_0_to_7 = tmp82__ >> 4 & 0xf; + pDst->bw_20_rx_max_nss_for_mcs_8_and_9 = tmp82__ >> 8 & 0xf; + pDst->bw_20_tx_max_nss_for_mcs_8_and_9 = tmp82__ >> 12 & 0xf; + pDst->bw_20_rx_max_nss_for_mcs_10_and_11 = tmp82__ >> 16 & 0xf; + pDst->bw_20_tx_max_nss_for_mcs_10_and_11 = tmp82__ >> 20 & 0xf; + pDst->bw_20_rx_max_nss_for_mcs_12_and_13 = tmp82__ >> 24 & 0xf; + pDst->bw_20_tx_max_nss_for_mcs_12_and_13 = tmp82__ >> 28 & 0xf; if (unlikely(ielen < 4)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -8761,24 +8757,40 @@ uint32_t dot11f_unpack_ie_eht_cap(tpAniSirGlobal pCtx, framesntohl(pCtx, &tmp83__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->bw_160_rx_max_nss_for_mcs_10_and_11 = tmp83__ >> 0 & 0xf; - pDst->bw_160_tx_max_nss_for_mcs_10_and_11 = tmp83__ >> 4 & 0xf; - pDst->bw_160_rx_max_nss_for_mcs_12_and_13 = tmp83__ >> 8 & 0xf; - pDst->bw_160_tx_max_nss_for_mcs_12_and_13 = tmp83__ >> 12 & 0xf; - pDst->bw_320_rx_max_nss_for_mcs_0_to_9 = tmp83__ >> 16 & 0xf; - pDst->bw_320_tx_max_nss_for_mcs_0_to_9 = tmp83__ >> 20 & 0xf; - pDst->bw_320_rx_max_nss_for_mcs_10_and_11 = tmp83__ >> 24 & 0xf; - pDst->bw_320_tx_max_nss_for_mcs_10_and_11 = tmp83__ >> 28 & 0xf; + pDst->bw_le_80_rx_max_nss_for_mcs_0_to_9 = tmp83__ >> 0 & 0xf; + pDst->bw_le_80_tx_max_nss_for_mcs_0_to_9 = tmp83__ >> 4 & 0xf; + pDst->bw_le_80_rx_max_nss_for_mcs_10_and_11 = tmp83__ >> 8 & 0xf; + pDst->bw_le_80_tx_max_nss_for_mcs_10_and_11 = tmp83__ >> 12 & 0xf; + pDst->bw_le_80_rx_max_nss_for_mcs_12_and_13 = tmp83__ >> 16 & 0xf; + pDst->bw_le_80_tx_max_nss_for_mcs_12_and_13 = tmp83__ >> 20 & 0xf; + pDst->bw_160_rx_max_nss_for_mcs_0_to_9 = tmp83__ >> 24 & 0xf; + pDst->bw_160_tx_max_nss_for_mcs_0_to_9 = tmp83__ >> 28 & 0xf; + if (unlikely(ielen < 4)) { + pDst->present = 0; + return DOT11F_INCOMPLETE_IE; + } + + framesntohl(pCtx, &tmp84__, pBuf, 0); + pBuf += 4; + ielen -= 4; + pDst->bw_160_rx_max_nss_for_mcs_10_and_11 = tmp84__ >> 0 & 0xf; + pDst->bw_160_tx_max_nss_for_mcs_10_and_11 = tmp84__ >> 4 & 0xf; + pDst->bw_160_rx_max_nss_for_mcs_12_and_13 = tmp84__ >> 8 & 0xf; + pDst->bw_160_tx_max_nss_for_mcs_12_and_13 = tmp84__ >> 12 & 0xf; + pDst->bw_320_rx_max_nss_for_mcs_0_to_9 = tmp84__ >> 16 & 0xf; + pDst->bw_320_tx_max_nss_for_mcs_0_to_9 = tmp84__ >> 20 & 0xf; + pDst->bw_320_rx_max_nss_for_mcs_10_and_11 = tmp84__ >> 24 & 0xf; + pDst->bw_320_tx_max_nss_for_mcs_10_and_11 = tmp84__ >> 28 & 0xf; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - tmp84__ = *pBuf; + tmp85__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->bw_320_rx_max_nss_for_mcs_12_and_13 = tmp84__ >> 0 & 0xf; - pDst->bw_320_tx_max_nss_for_mcs_12_and_13 = tmp84__ >> 4 & 0xf; + pDst->bw_320_rx_max_nss_for_mcs_12_and_13 = tmp85__ >> 0 & 0xf; + pDst->bw_320_tx_max_nss_for_mcs_12_and_13 = tmp85__ >> 4 & 0xf; switch (pDst->ppet_present) { case 1: pDst->ppet.ppe_threshold.num_ppe_th = (uint8_t)(ielen); @@ -8806,8 +8818,8 @@ uint32_t dot11f_unpack_ie_eht_op(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp85__; uint8_t tmp86__; + uint8_t tmp87__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -8817,11 +8829,11 @@ uint32_t dot11f_unpack_ie_eht_op(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp85__ = *pBuf; + tmp86__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->width = tmp85__ >> 0 & 0x7; - pDst->reserved = tmp85__ >> 3 & 0x1f; + pDst->width = tmp86__ >> 0 & 0x7; + pDst->reserved = tmp86__ >> 3 & 0x1f; if (unlikely(ielen < 2)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -8835,11 +8847,11 @@ uint32_t dot11f_unpack_ie_eht_op(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp86__ = *pBuf; + tmp87__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->disable_sub_chan_bitmap_present = tmp86__ >> 0 & 0x1; - pDst->reserved2 = tmp86__ >> 1 & 0x7f; + pDst->disable_sub_chan_bitmap_present = tmp87__ >> 0 & 0x1; + pDst->reserved2 = tmp87__ >> 1 & 0x7f; if (unlikely(ielen < pDst->disable_sub_chan_bitmap_present * 2)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -8998,7 +9010,7 @@ uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp87__; + uint16_t tmp88__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9008,18 +9020,18 @@ uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp87__, pBuf, 0); + framesntohs(pCtx, &tmp88__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->public_key_identifiers_cnt = tmp87__ >> 0 & 0x7; - pDst->realm_identifiers_cnt = tmp87__ >> 3 & 0x7; - pDst->is_ip_config_supported = tmp87__ >> 6 & 0x1; - pDst->is_cache_id_present = tmp87__ >> 7 & 0x1; - pDst->is_hessid_present = tmp87__ >> 8 & 0x1; - pDst->is_fils_sk_auth_supported = tmp87__ >> 9 & 0x1; - pDst->is_fils_sk_auth_pfs_supported = tmp87__ >> 10 & 0x1; - pDst->is_pk_auth_supported = tmp87__ >> 11 & 0x1; - pDst->reserved = tmp87__ >> 12 & 0xf; + pDst->public_key_identifiers_cnt = tmp88__ >> 0 & 0x7; + pDst->realm_identifiers_cnt = tmp88__ >> 3 & 0x7; + pDst->is_ip_config_supported = tmp88__ >> 6 & 0x1; + pDst->is_cache_id_present = tmp88__ >> 7 & 0x1; + pDst->is_hessid_present = tmp88__ >> 8 & 0x1; + pDst->is_fils_sk_auth_supported = tmp88__ >> 9 & 0x1; + pDst->is_fils_sk_auth_pfs_supported = tmp88__ >> 10 & 0x1; + pDst->is_pk_auth_supported = tmp88__ >> 11 & 0x1; + pDst->reserved = tmp88__ >> 12 & 0xf; pDst->num_variable_data = (uint8_t)(ielen); DOT11F_MEMCPY(pCtx, pDst->variable_data, pBuf, (ielen)); (void)pCtx; @@ -9200,7 +9212,7 @@ uint32_t dot11f_unpack_ie_he_6ghz_band_cap(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp88__; + uint16_t tmp89__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9210,15 +9222,15 @@ uint32_t dot11f_unpack_ie_he_6ghz_band_cap(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp88__, pBuf, 0); - pDst->min_mpdu_start_spacing = tmp88__ >> 0 & 0x7; - pDst->max_ampdu_len_exp = tmp88__ >> 3 & 0x7; - pDst->max_mpdu_len = tmp88__ >> 6 & 0x7; - pDst->sm_pow_save = tmp88__ >> 9 & 0x3; - pDst->rd_responder = tmp88__ >> 11 & 0x1; - pDst->rx_ant_pattern_consistency = tmp88__ >> 12 & 0x1; - pDst->tx_ant_pattern_consistency = tmp88__ >> 13 & 0x1; - pDst->reserved = tmp88__ >> 14 & 0x3; + framesntohs(pCtx, &tmp89__, pBuf, 0); + pDst->min_mpdu_start_spacing = tmp89__ >> 0 & 0x7; + pDst->max_ampdu_len_exp = tmp89__ >> 3 & 0x7; + pDst->max_mpdu_len = tmp89__ >> 6 & 0x7; + pDst->sm_pow_save = tmp89__ >> 9 & 0x3; + pDst->rd_responder = tmp89__ >> 11 & 0x1; + pDst->rx_ant_pattern_consistency = tmp89__ >> 12 & 0x1; + pDst->tx_ant_pattern_consistency = tmp89__ >> 13 & 0x1; + pDst->reserved = tmp89__ >> 14 & 0x3; (void)pCtx; return status; } /* End dot11f_unpack_ie_he_6ghz_band_cap. */ @@ -9233,11 +9245,11 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint32_t tmp89__; - uint16_t tmp90__; - uint32_t tmp91__; + uint32_t tmp90__; + uint16_t tmp91__; uint32_t tmp92__; - uint16_t tmp93__; + uint32_t tmp93__; + uint16_t tmp94__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9247,84 +9259,54 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohl(pCtx, &tmp89__, pBuf, 0); + framesntohl(pCtx, &tmp90__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->htc_he = tmp89__ >> 0 & 0x1; - pDst->twt_request = tmp89__ >> 1 & 0x1; - pDst->twt_responder = tmp89__ >> 2 & 0x1; - pDst->fragmentation = tmp89__ >> 3 & 0x3; - pDst->max_num_frag_msdu_amsdu_exp = tmp89__ >> 5 & 0x7; - pDst->min_frag_size = tmp89__ >> 8 & 0x3; - pDst->trigger_frm_mac_pad = tmp89__ >> 10 & 0x3; - pDst->multi_tid_aggr_rx_supp = tmp89__ >> 12 & 0x7; - pDst->he_link_adaptation = tmp89__ >> 15 & 0x3; - pDst->all_ack = tmp89__ >> 17 & 0x1; - pDst->trigd_rsp_sched = tmp89__ >> 18 & 0x1; - pDst->a_bsr = tmp89__ >> 19 & 0x1; - pDst->broadcast_twt = tmp89__ >> 20 & 0x1; - pDst->ba_32bit_bitmap = tmp89__ >> 21 & 0x1; - pDst->mu_cascade = tmp89__ >> 22 & 0x1; - pDst->ack_enabled_multitid = tmp89__ >> 23 & 0x1; - pDst->reserved = tmp89__ >> 24 & 0x1; - pDst->omi_a_ctrl = tmp89__ >> 25 & 0x1; - pDst->ofdma_ra = tmp89__ >> 26 & 0x1; - pDst->max_ampdu_len_exp_ext = tmp89__ >> 27 & 0x3; - pDst->amsdu_frag = tmp89__ >> 29 & 0x1; - pDst->flex_twt_sched = tmp89__ >> 30 & 0x1; - pDst->rx_ctrl_frame = tmp89__ >> 31 & 0x1; + pDst->htc_he = tmp90__ >> 0 & 0x1; + pDst->twt_request = tmp90__ >> 1 & 0x1; + pDst->twt_responder = tmp90__ >> 2 & 0x1; + pDst->fragmentation = tmp90__ >> 3 & 0x3; + pDst->max_num_frag_msdu_amsdu_exp = tmp90__ >> 5 & 0x7; + pDst->min_frag_size = tmp90__ >> 8 & 0x3; + pDst->trigger_frm_mac_pad = tmp90__ >> 10 & 0x3; + pDst->multi_tid_aggr_rx_supp = tmp90__ >> 12 & 0x7; + pDst->he_link_adaptation = tmp90__ >> 15 & 0x3; + pDst->all_ack = tmp90__ >> 17 & 0x1; + pDst->trigd_rsp_sched = tmp90__ >> 18 & 0x1; + pDst->a_bsr = tmp90__ >> 19 & 0x1; + pDst->broadcast_twt = tmp90__ >> 20 & 0x1; + pDst->ba_32bit_bitmap = tmp90__ >> 21 & 0x1; + pDst->mu_cascade = tmp90__ >> 22 & 0x1; + pDst->ack_enabled_multitid = tmp90__ >> 23 & 0x1; + pDst->reserved = tmp90__ >> 24 & 0x1; + pDst->omi_a_ctrl = tmp90__ >> 25 & 0x1; + pDst->ofdma_ra = tmp90__ >> 26 & 0x1; + pDst->max_ampdu_len_exp_ext = tmp90__ >> 27 & 0x3; + pDst->amsdu_frag = tmp90__ >> 29 & 0x1; + pDst->flex_twt_sched = tmp90__ >> 30 & 0x1; + pDst->rx_ctrl_frame = tmp90__ >> 31 & 0x1; if (unlikely(ielen < 2)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp90__, pBuf, 0); + framesntohs(pCtx, &tmp91__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->bsrp_ampdu_aggr = tmp90__ >> 0 & 0x1; - pDst->qtp = tmp90__ >> 1 & 0x1; - pDst->a_bqr = tmp90__ >> 2 & 0x1; - pDst->spatial_reuse_param_rspder = tmp90__ >> 3 & 0x1; - pDst->ndp_feedback_supp = tmp90__ >> 4 & 0x1; - pDst->ops_supp = tmp90__ >> 5 & 0x1; - pDst->amsdu_in_ampdu = tmp90__ >> 6 & 0x1; - pDst->multi_tid_aggr_tx_supp = tmp90__ >> 7 & 0x7; - pDst->he_sub_ch_sel_tx_supp = tmp90__ >> 10 & 0x1; - pDst->ul_2x996_tone_ru_supp = tmp90__ >> 11 & 0x1; - pDst->om_ctrl_ul_mu_data_dis_rx = tmp90__ >> 12 & 0x1; - pDst->he_dynamic_smps = tmp90__ >> 13 & 0x1; - pDst->punctured_sounding_supp = tmp90__ >> 14 & 0x1; - pDst->ht_vht_trg_frm_rx_supp = tmp90__ >> 15 & 0x1; - if (unlikely(ielen < 4)) { - pDst->present = 0; - return DOT11F_INCOMPLETE_IE; - } - - framesntohl(pCtx, &tmp91__, pBuf, 0); - pBuf += 4; - ielen -= 4; - pDst->reserved2 = tmp91__ >> 0 & 0x1; - pDst->chan_width_0 = tmp91__ >> 1 & 0x1; - pDst->chan_width_1 = tmp91__ >> 2 & 0x1; - pDst->chan_width_2 = tmp91__ >> 3 & 0x1; - pDst->chan_width_3 = tmp91__ >> 4 & 0x1; - pDst->chan_width_4 = tmp91__ >> 5 & 0x1; - pDst->chan_width_5 = tmp91__ >> 6 & 0x1; - pDst->chan_width_6 = tmp91__ >> 7 & 0x1; - pDst->rx_pream_puncturing = tmp91__ >> 8 & 0xf; - pDst->device_class = tmp91__ >> 12 & 0x1; - pDst->ldpc_coding = tmp91__ >> 13 & 0x1; - pDst->he_1x_ltf_800_gi_ppdu = tmp91__ >> 14 & 0x1; - pDst->midamble_tx_rx_max_nsts = tmp91__ >> 15 & 0x3; - pDst->he_4x_ltf_3200_gi_ndp = tmp91__ >> 17 & 0x1; - pDst->tb_ppdu_tx_stbc_lt_80mhz = tmp91__ >> 18 & 0x1; - pDst->rx_stbc_lt_80mhz = tmp91__ >> 19 & 0x1; - pDst->doppler = tmp91__ >> 20 & 0x3; - pDst->ul_mu = tmp91__ >> 22 & 0x3; - pDst->dcm_enc_tx = tmp91__ >> 24 & 0x7; - pDst->dcm_enc_rx = tmp91__ >> 27 & 0x7; - pDst->ul_he_mu = tmp91__ >> 30 & 0x1; - pDst->su_beamformer = tmp91__ >> 31 & 0x1; + pDst->bsrp_ampdu_aggr = tmp91__ >> 0 & 0x1; + pDst->qtp = tmp91__ >> 1 & 0x1; + pDst->a_bqr = tmp91__ >> 2 & 0x1; + pDst->spatial_reuse_param_rspder = tmp91__ >> 3 & 0x1; + pDst->ndp_feedback_supp = tmp91__ >> 4 & 0x1; + pDst->ops_supp = tmp91__ >> 5 & 0x1; + pDst->amsdu_in_ampdu = tmp91__ >> 6 & 0x1; + pDst->multi_tid_aggr_tx_supp = tmp91__ >> 7 & 0x7; + pDst->he_sub_ch_sel_tx_supp = tmp91__ >> 10 & 0x1; + pDst->ul_2x996_tone_ru_supp = tmp91__ >> 11 & 0x1; + pDst->om_ctrl_ul_mu_data_dis_rx = tmp91__ >> 12 & 0x1; + pDst->he_dynamic_smps = tmp91__ >> 13 & 0x1; + pDst->punctured_sounding_supp = tmp91__ >> 14 & 0x1; + pDst->ht_vht_trg_frm_rx_supp = tmp91__ >> 15 & 0x1; if (unlikely(ielen < 4)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -9333,48 +9315,78 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, framesntohl(pCtx, &tmp92__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->su_beamformee = tmp92__ >> 0 & 0x1; - pDst->mu_beamformer = tmp92__ >> 1 & 0x1; - pDst->bfee_sts_lt_80 = tmp92__ >> 2 & 0x7; - pDst->bfee_sts_gt_80 = tmp92__ >> 5 & 0x7; - pDst->num_sounding_lt_80 = tmp92__ >> 8 & 0x7; - pDst->num_sounding_gt_80 = tmp92__ >> 11 & 0x7; - pDst->su_feedback_tone16 = tmp92__ >> 14 & 0x1; - pDst->mu_feedback_tone16 = tmp92__ >> 15 & 0x1; - pDst->codebook_su = tmp92__ >> 16 & 0x1; - pDst->codebook_mu = tmp92__ >> 17 & 0x1; - pDst->beamforming_feedback = tmp92__ >> 18 & 0x7; - pDst->he_er_su_ppdu = tmp92__ >> 21 & 0x1; - pDst->dl_mu_mimo_part_bw = tmp92__ >> 22 & 0x1; - pDst->ppet_present = tmp92__ >> 23 & 0x1; - pDst->srp = tmp92__ >> 24 & 0x1; - pDst->power_boost = tmp92__ >> 25 & 0x1; - pDst->he_ltf_800_gi_4x = tmp92__ >> 26 & 0x1; - pDst->max_nc = tmp92__ >> 27 & 0x7; - pDst->tb_ppdu_tx_stbc_gt_80mhz = tmp92__ >> 30 & 0x1; - pDst->rx_stbc_gt_80mhz = tmp92__ >> 31 & 0x1; + pDst->reserved2 = tmp92__ >> 0 & 0x1; + pDst->chan_width_0 = tmp92__ >> 1 & 0x1; + pDst->chan_width_1 = tmp92__ >> 2 & 0x1; + pDst->chan_width_2 = tmp92__ >> 3 & 0x1; + pDst->chan_width_3 = tmp92__ >> 4 & 0x1; + pDst->chan_width_4 = tmp92__ >> 5 & 0x1; + pDst->chan_width_5 = tmp92__ >> 6 & 0x1; + pDst->chan_width_6 = tmp92__ >> 7 & 0x1; + pDst->rx_pream_puncturing = tmp92__ >> 8 & 0xf; + pDst->device_class = tmp92__ >> 12 & 0x1; + pDst->ldpc_coding = tmp92__ >> 13 & 0x1; + pDst->he_1x_ltf_800_gi_ppdu = tmp92__ >> 14 & 0x1; + pDst->midamble_tx_rx_max_nsts = tmp92__ >> 15 & 0x3; + pDst->he_4x_ltf_3200_gi_ndp = tmp92__ >> 17 & 0x1; + pDst->tb_ppdu_tx_stbc_lt_80mhz = tmp92__ >> 18 & 0x1; + pDst->rx_stbc_lt_80mhz = tmp92__ >> 19 & 0x1; + pDst->doppler = tmp92__ >> 20 & 0x3; + pDst->ul_mu = tmp92__ >> 22 & 0x3; + pDst->dcm_enc_tx = tmp92__ >> 24 & 0x7; + pDst->dcm_enc_rx = tmp92__ >> 27 & 0x7; + pDst->ul_he_mu = tmp92__ >> 30 & 0x1; + pDst->su_beamformer = tmp92__ >> 31 & 0x1; + if (unlikely(ielen < 4)) { + pDst->present = 0; + return DOT11F_INCOMPLETE_IE; + } + + framesntohl(pCtx, &tmp93__, pBuf, 0); + pBuf += 4; + ielen -= 4; + pDst->su_beamformee = tmp93__ >> 0 & 0x1; + pDst->mu_beamformer = tmp93__ >> 1 & 0x1; + pDst->bfee_sts_lt_80 = tmp93__ >> 2 & 0x7; + pDst->bfee_sts_gt_80 = tmp93__ >> 5 & 0x7; + pDst->num_sounding_lt_80 = tmp93__ >> 8 & 0x7; + pDst->num_sounding_gt_80 = tmp93__ >> 11 & 0x7; + pDst->su_feedback_tone16 = tmp93__ >> 14 & 0x1; + pDst->mu_feedback_tone16 = tmp93__ >> 15 & 0x1; + pDst->codebook_su = tmp93__ >> 16 & 0x1; + pDst->codebook_mu = tmp93__ >> 17 & 0x1; + pDst->beamforming_feedback = tmp93__ >> 18 & 0x7; + pDst->he_er_su_ppdu = tmp93__ >> 21 & 0x1; + pDst->dl_mu_mimo_part_bw = tmp93__ >> 22 & 0x1; + pDst->ppet_present = tmp93__ >> 23 & 0x1; + pDst->srp = tmp93__ >> 24 & 0x1; + pDst->power_boost = tmp93__ >> 25 & 0x1; + pDst->he_ltf_800_gi_4x = tmp93__ >> 26 & 0x1; + pDst->max_nc = tmp93__ >> 27 & 0x7; + pDst->tb_ppdu_tx_stbc_gt_80mhz = tmp93__ >> 30 & 0x1; + pDst->rx_stbc_gt_80mhz = tmp93__ >> 31 & 0x1; if (unlikely(ielen < 2)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp93__, pBuf, 0); + framesntohs(pCtx, &tmp94__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->er_he_ltf_800_gi_4x = tmp93__ >> 0 & 0x1; - pDst->he_ppdu_20_in_40Mhz_2G = tmp93__ >> 1 & 0x1; - pDst->he_ppdu_20_in_160_80p80Mhz = tmp93__ >> 2 & 0x1; - pDst->he_ppdu_80_in_160_80p80Mhz = tmp93__ >> 3 & 0x1; - pDst->er_1x_he_ltf_gi = tmp93__ >> 4 & 0x1; - pDst->midamble_tx_rx_1x_he_ltf = tmp93__ >> 5 & 0x1; - pDst->dcm_max_bw = tmp93__ >> 6 & 0x3; - pDst->longer_than_16_he_sigb_ofdm_sym = tmp93__ >> 8 & 0x1; - pDst->non_trig_cqi_feedback = tmp93__ >> 9 & 0x1; - pDst->tx_1024_qam_lt_242_tone_ru = tmp93__ >> 10 & 0x1; - pDst->rx_1024_qam_lt_242_tone_ru = tmp93__ >> 11 & 0x1; - pDst->rx_full_bw_su_he_mu_compress_sigb = tmp93__ >> 12 & 0x1; - pDst->rx_full_bw_su_he_mu_non_cmpr_sigb = tmp93__ >> 13 & 0x1; - pDst->reserved3 = tmp93__ >> 14 & 0x3; + pDst->er_he_ltf_800_gi_4x = tmp94__ >> 0 & 0x1; + pDst->he_ppdu_20_in_40Mhz_2G = tmp94__ >> 1 & 0x1; + pDst->he_ppdu_20_in_160_80p80Mhz = tmp94__ >> 2 & 0x1; + pDst->he_ppdu_80_in_160_80p80Mhz = tmp94__ >> 3 & 0x1; + pDst->er_1x_he_ltf_gi = tmp94__ >> 4 & 0x1; + pDst->midamble_tx_rx_1x_he_ltf = tmp94__ >> 5 & 0x1; + pDst->dcm_max_bw = tmp94__ >> 6 & 0x3; + pDst->longer_than_16_he_sigb_ofdm_sym = tmp94__ >> 8 & 0x1; + pDst->non_trig_cqi_feedback = tmp94__ >> 9 & 0x1; + pDst->tx_1024_qam_lt_242_tone_ru = tmp94__ >> 10 & 0x1; + pDst->rx_1024_qam_lt_242_tone_ru = tmp94__ >> 11 & 0x1; + pDst->rx_full_bw_su_he_mu_compress_sigb = tmp94__ >> 12 & 0x1; + pDst->rx_full_bw_su_he_mu_non_cmpr_sigb = tmp94__ >> 13 & 0x1; + pDst->reserved3 = tmp94__ >> 14 & 0x3; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -9478,10 +9490,10 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp94__; - uint8_t tmp95__; + uint16_t tmp95__; uint8_t tmp96__; uint8_t tmp97__; + uint8_t tmp98__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9491,25 +9503,14 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp94__, pBuf, 0); + framesntohs(pCtx, &tmp95__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->default_pe = tmp94__ >> 0 & 0x7; - pDst->twt_required = tmp94__ >> 3 & 0x1; - pDst->txop_rts_threshold = tmp94__ >> 4 & 0x3ff; - pDst->vht_oper_present = tmp94__ >> 14 & 0x1; - pDst->co_located_bss = tmp94__ >> 15 & 0x1; - if (unlikely(ielen < 1)) { - pDst->present = 0; - return DOT11F_INCOMPLETE_IE; - } - - tmp95__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->er_su_disable = tmp95__ >> 0 & 0x1; - pDst->oper_info_6g_present = tmp95__ >> 1 & 0x1; - pDst->reserved2 = tmp95__ >> 2 & 0x3f; + pDst->default_pe = tmp95__ >> 0 & 0x7; + pDst->twt_required = tmp95__ >> 3 & 0x1; + pDst->txop_rts_threshold = tmp95__ >> 4 & 0x3ff; + pDst->vht_oper_present = tmp95__ >> 14 & 0x1; + pDst->co_located_bss = tmp95__ >> 15 & 0x1; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -9518,9 +9519,20 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, tmp96__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->bss_color = tmp96__ >> 0 & 0x3f; - pDst->partial_bss_col = tmp96__ >> 6 & 0x1; - pDst->bss_col_disabled = tmp96__ >> 7 & 0x1; + pDst->er_su_disable = tmp96__ >> 0 & 0x1; + pDst->oper_info_6g_present = tmp96__ >> 1 & 0x1; + pDst->reserved2 = tmp96__ >> 2 & 0x3f; + if (unlikely(ielen < 1)) { + pDst->present = 0; + return DOT11F_INCOMPLETE_IE; + } + + tmp97__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->bss_color = tmp97__ >> 0 & 0x3f; + pDst->partial_bss_col = tmp97__ >> 6 & 0x1; + pDst->bss_col_disabled = tmp97__ >> 7 & 0x1; if (unlikely(ielen < 2)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -9584,13 +9596,13 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp97__ = *pBuf; + tmp98__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->oper_info_6g.info.ch_width = tmp97__ >> 0 & 0x3; - pDst->oper_info_6g.info.dup_bcon = tmp97__ >> 2 & 0x1; - pDst->oper_info_6g.info.reg_info = tmp97__ >> 3 & 0x7; - pDst->oper_info_6g.info.reserved = tmp97__ >> 6 & 0x3; + pDst->oper_info_6g.info.ch_width = tmp98__ >> 0 & 0x3; + pDst->oper_info_6g.info.dup_bcon = tmp98__ >> 2 & 0x1; + pDst->oper_info_6g.info.reg_info = tmp98__ >> 3 & 0x7; + pDst->oper_info_6g.info.reserved = tmp98__ >> 6 & 0x3; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -9631,7 +9643,7 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp98__; + uint8_t tmp99__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9641,13 +9653,13 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp98__ = *pBuf; + tmp99__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->dgaf_dis = tmp98__ >> 0 & 0x1; - pDst->hs_id_present = tmp98__ >> 1 & 0x3; - pDst->reserved = tmp98__ >> 3 & 0x1; - pDst->release_num = tmp98__ >> 4 & 0xf; + pDst->dgaf_dis = tmp99__ >> 0 & 0x1; + pDst->hs_id_present = tmp99__ >> 1 & 0x3; + pDst->reserved = tmp99__ >> 3 & 0x1; + pDst->release_num = tmp99__ >> 4 & 0xf; if (!ielen) { return 0U; } else { @@ -9688,7 +9700,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp99__; + uint8_t tmp100__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9698,13 +9710,13 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp99__ = *pBuf; - pDst->info_request = tmp99__ >> 0 & 0x1; - pDst->forty_mhz_intolerant = tmp99__ >> 1 & 0x1; - pDst->twenty_mhz_bsswidth_req = tmp99__ >> 2 & 0x1; - pDst->obss_scan_exemption_req = tmp99__ >> 3 & 0x1; - pDst->obss_scan_exemption_grant = tmp99__ >> 4 & 0x1; - pDst->unused = tmp99__ >> 5 & 0x7; + tmp100__ = *pBuf; + pDst->info_request = tmp100__ >> 0 & 0x1; + pDst->forty_mhz_intolerant = tmp100__ >> 1 & 0x1; + pDst->twenty_mhz_bsswidth_req = tmp100__ >> 2 & 0x1; + pDst->obss_scan_exemption_req = tmp100__ >> 3 & 0x1; + pDst->obss_scan_exemption_grant = tmp100__ >> 4 & 0x1; + pDst->unused = tmp100__ >> 5 & 0x7; (void)pCtx; return status; } /* End dot11f_unpack_ie_ht2040_bss_coexistence. */ @@ -9788,12 +9800,12 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp100__; - uint8_t tmp101__; - uint16_t tmp102__; + uint16_t tmp101__; + uint8_t tmp102__; uint16_t tmp103__; - uint8_t tmp104__; - uint16_t tmp105__; + uint16_t tmp104__; + uint8_t tmp105__; + uint16_t tmp106__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9803,18 +9815,18 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp100__, pBuf, 0); + framesntohs(pCtx, &tmp101__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->type = tmp100__ >> 0 & 0x7; - pDst->reserved = tmp100__ >> 3 & 0x1; - pDst->mld_mac_addr_present = tmp100__ >> 4 & 0x1; - pDst->link_id_info_present = tmp100__ >> 5 & 0x1; - pDst->bss_param_change_cnt_present = tmp100__ >> 6 & 0x1; - pDst->medium_sync_delay_info_present = tmp100__ >> 7 & 0x1; - pDst->eml_capab_present = tmp100__ >> 8 & 0x1; - pDst->mld_capab_present = tmp100__ >> 9 & 0x1; - pDst->reserved_1 = tmp100__ >> 10 & 0x3f; + pDst->type = tmp101__ >> 0 & 0x7; + pDst->reserved = tmp101__ >> 3 & 0x1; + pDst->mld_mac_addr_present = tmp101__ >> 4 & 0x1; + pDst->link_id_info_present = tmp101__ >> 5 & 0x1; + pDst->bss_param_change_cnt_present = tmp101__ >> 6 & 0x1; + pDst->medium_sync_delay_info_present = tmp101__ >> 7 & 0x1; + pDst->eml_capab_present = tmp101__ >> 8 & 0x1; + pDst->mld_capab_present = tmp101__ >> 9 & 0x1; + pDst->reserved_1 = tmp101__ >> 10 & 0x3f; switch (pDst->mld_mac_addr_present) { case 1: if (unlikely(ielen < 6)) { @@ -9834,11 +9846,11 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp101__ = *pBuf; + tmp102__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->link_id_info.info.link_id = tmp101__ >> 0 & 0xf; - pDst->link_id_info.info.reserved = tmp101__ >> 4 & 0xf; + pDst->link_id_info.info.link_id = tmp102__ >> 0 & 0xf; + pDst->link_id_info.info.reserved = tmp102__ >> 4 & 0xf; break; } switch (pDst->bss_param_change_cnt_present) { @@ -9860,12 +9872,12 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp102__, pBuf, 0); + framesntohs(pCtx, &tmp103__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->medium_sync_delay_info.info.medium_sync_duration = tmp102__ >> 0 & 0xff; - pDst->medium_sync_delay_info.info.medium_sync_ofdm_ed_thresh = tmp102__ >> 8 & 0xf; - pDst->medium_sync_delay_info.info.medium_sync_max_txop_num = tmp102__ >> 12 & 0xf; + pDst->medium_sync_delay_info.info.medium_sync_duration = tmp103__ >> 0 & 0xff; + pDst->medium_sync_delay_info.info.medium_sync_ofdm_ed_thresh = tmp103__ >> 8 & 0xf; + pDst->medium_sync_delay_info.info.medium_sync_max_txop_num = tmp103__ >> 12 & 0xf; break; } switch (pDst->eml_capab_present) { @@ -9875,25 +9887,25 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp103__, pBuf, 0); + framesntohs(pCtx, &tmp104__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->eml_capabilities.info.emlsr_support = tmp103__ >> 0 & 0x1; - pDst->eml_capabilities.info.emlsr_delay = tmp103__ >> 1 & 0x7; - pDst->eml_capabilities.info.emlmr_support = tmp103__ >> 4 & 0x1; - pDst->eml_capabilities.info.emlmr_delay = tmp103__ >> 5 & 0x7; - pDst->eml_capabilities.info.transition_timeout = tmp103__ >> 8 & 0xf; - pDst->eml_capabilities.info.reserved = tmp103__ >> 12 & 0xf; + pDst->eml_capabilities.info.emlsr_support = tmp104__ >> 0 & 0x1; + pDst->eml_capabilities.info.emlsr_delay = tmp104__ >> 1 & 0x7; + pDst->eml_capabilities.info.emlmr_support = tmp104__ >> 4 & 0x1; + pDst->eml_capabilities.info.emlmr_delay = tmp104__ >> 5 & 0x7; + pDst->eml_capabilities.info.transition_timeout = tmp104__ >> 8 & 0xf; + pDst->eml_capabilities.info.reserved = tmp104__ >> 12 & 0xf; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - tmp104__ = *pBuf; + tmp105__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->eml_capabilities.info.emlmr_rx_nss = tmp104__ >> 0 & 0xf; - pDst->eml_capabilities.info.emlmr_tx_nss = tmp104__ >> 4 & 0xf; + pDst->eml_capabilities.info.emlmr_rx_nss = tmp105__ >> 0 & 0xf; + pDst->eml_capabilities.info.emlmr_tx_nss = tmp105__ >> 4 & 0xf; break; } switch (pDst->mld_capab_present) { @@ -9903,14 +9915,14 @@ uint32_t dot11f_unpack_ie_mlo_ie(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp105__, pBuf, 0); + framesntohs(pCtx, &tmp106__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->mld_capabilities.info.max_simultaneous_link_num = tmp105__ >> 0 & 0xf; - pDst->mld_capabilities.info.srs_support = tmp105__ >> 4 & 0x1; - pDst->mld_capabilities.info.tid_link_map_supported = tmp105__ >> 5 & 0x3; - pDst->mld_capabilities.info.str_freq_separation = tmp105__ >> 7 & 0x1f; - pDst->mld_capabilities.info.reserved = tmp105__ >> 12 & 0xf; + pDst->mld_capabilities.info.max_simultaneous_link_num = tmp106__ >> 0 & 0xf; + pDst->mld_capabilities.info.srs_support = tmp106__ >> 4 & 0x1; + pDst->mld_capabilities.info.tid_link_map_supported = tmp106__ >> 5 & 0x3; + pDst->mld_capabilities.info.str_freq_separation = tmp106__ >> 7 & 0x1f; + pDst->mld_capabilities.info.reserved = tmp106__ >> 12 & 0xf; break; } (void)pCtx; @@ -9935,7 +9947,6 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp106__; uint8_t tmp107__; uint8_t tmp108__; uint8_t tmp109__; @@ -9943,6 +9954,7 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp111__; uint8_t tmp112__; uint8_t tmp113__; + uint8_t tmp114__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -9960,23 +9972,23 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp106__ = *pBuf; + tmp107__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp106__ >> 0 & 0xf; - pDst->acbe_acm = tmp106__ >> 4 & 0x1; - pDst->acbe_aci = tmp106__ >> 5 & 0x3; - pDst->unused1 = tmp106__ >> 7 & 0x1; + pDst->acbe_aifsn = tmp107__ >> 0 & 0xf; + pDst->acbe_acm = tmp107__ >> 4 & 0x1; + pDst->acbe_aci = tmp107__ >> 5 & 0x3; + pDst->unused1 = tmp107__ >> 7 & 0x1; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - tmp107__ = *pBuf; + tmp108__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_acwmin = tmp107__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp107__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp108__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp108__ >> 4 & 0xf; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -9990,23 +10002,23 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp108__ = *pBuf; + tmp109__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp108__ >> 0 & 0xf; - pDst->acbk_acm = tmp108__ >> 4 & 0x1; - pDst->acbk_aci = tmp108__ >> 5 & 0x3; - pDst->unused2 = tmp108__ >> 7 & 0x1; + pDst->acbk_aifsn = tmp109__ >> 0 & 0xf; + pDst->acbk_acm = tmp109__ >> 4 & 0x1; + pDst->acbk_aci = tmp109__ >> 5 & 0x3; + pDst->unused2 = tmp109__ >> 7 & 0x1; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - tmp109__ = *pBuf; + tmp110__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp109__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp109__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp110__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp110__ >> 4 & 0xf; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -10020,23 +10032,23 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp110__ = *pBuf; + tmp111__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp110__ >> 0 & 0xf; - pDst->acvi_acm = tmp110__ >> 4 & 0x1; - pDst->acvi_aci = tmp110__ >> 5 & 0x3; - pDst->unused3 = tmp110__ >> 7 & 0x1; + pDst->acvi_aifsn = tmp111__ >> 0 & 0xf; + pDst->acvi_acm = tmp111__ >> 4 & 0x1; + pDst->acvi_aci = tmp111__ >> 5 & 0x3; + pDst->unused3 = tmp111__ >> 7 & 0x1; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - tmp111__ = *pBuf; + tmp112__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp111__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp111__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp112__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp112__ >> 4 & 0xf; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -10050,23 +10062,23 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - tmp112__ = *pBuf; + tmp113__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp112__ >> 0 & 0xf; - pDst->acvo_acm = tmp112__ >> 4 & 0x1; - pDst->acvo_aci = tmp112__ >> 5 & 0x3; - pDst->unused4 = tmp112__ >> 7 & 0x1; + pDst->acvo_aifsn = tmp113__ >> 0 & 0xf; + pDst->acvo_acm = tmp113__ >> 4 & 0x1; + pDst->acvo_aci = tmp113__ >> 5 & 0x3; + pDst->unused4 = tmp113__ >> 7 & 0x1; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; } - tmp113__ = *pBuf; + tmp114__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp113__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp113__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp114__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp114__ >> 4 & 0xf; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -10222,10 +10234,10 @@ uint32_t dot11f_unpack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp114__; - uint32_t tmp115__; + uint16_t tmp115__; uint32_t tmp116__; uint32_t tmp117__; + uint32_t tmp118__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) return DOT11F_DUPLICATE_IE; @@ -10235,14 +10247,14 @@ uint32_t dot11f_unpack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohs(pCtx, &tmp114__, pBuf, 0); + framesntohs(pCtx, &tmp115__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->tbtt_type = tmp114__ >> 0 & 0x3; - pDst->filtered_neighbor_ap = tmp114__ >> 2 & 0x1; - pDst->reserved = tmp114__ >> 3 & 0x1; - pDst->tbtt_info_count = tmp114__ >> 4 & 0xf; - pDst->tbtt_info_len = tmp114__ >> 8 & 0xff; + pDst->tbtt_type = tmp115__ >> 0 & 0x3; + pDst->filtered_neighbor_ap = tmp115__ >> 2 & 0x1; + pDst->reserved = tmp115__ >> 3 & 0x1; + pDst->tbtt_info_count = tmp115__ >> 4 & 0xf; + pDst->tbtt_info_len = tmp115__ >> 8 & 0xff; if (unlikely(ielen < 1)) { pDst->present = 0; return DOT11F_INCOMPLETE_IE; @@ -10302,13 +10314,13 @@ uint32_t dot11f_unpack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohl(pCtx, &tmp115__, pBuf, 0); + framesntohl(pCtx, &tmp116__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->tbtt_info.tbtt_info_4.mld_id = tmp115__ >> 0 & 0xff; - pDst->tbtt_info.tbtt_info_4.link_id = tmp115__ >> 8 & 0xf; - pDst->tbtt_info.tbtt_info_4.bss_param_change_cnt = tmp115__ >> 12 & 0xff; - pDst->tbtt_info.tbtt_info_4.reserved = tmp115__ >> 20 & 0xfff; + pDst->tbtt_info.tbtt_info_4.mld_id = tmp116__ >> 0 & 0xff; + pDst->tbtt_info.tbtt_info_4.link_id = tmp116__ >> 8 & 0xf; + pDst->tbtt_info.tbtt_info_4.bss_param_change_cnt = tmp116__ >> 12 & 0xff; + pDst->tbtt_info.tbtt_info_4.reserved = tmp116__ >> 20 & 0xfff; break; case 5: if (unlikely(ielen < 1)) { @@ -10454,13 +10466,13 @@ uint32_t dot11f_unpack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohl(pCtx, &tmp116__, pBuf, 0); + framesntohl(pCtx, &tmp117__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->tbtt_info.tbtt_info_10.mld_id = tmp116__ >> 0 & 0xff; - pDst->tbtt_info.tbtt_info_10.link_id = tmp116__ >> 8 & 0xf; - pDst->tbtt_info.tbtt_info_10.bss_param_change_cnt = tmp116__ >> 12 & 0xff; - pDst->tbtt_info.tbtt_info_10.reserved = tmp116__ >> 20 & 0xfff; + pDst->tbtt_info.tbtt_info_10.mld_id = tmp117__ >> 0 & 0xff; + pDst->tbtt_info.tbtt_info_10.link_id = tmp117__ >> 8 & 0xf; + pDst->tbtt_info.tbtt_info_10.bss_param_change_cnt = tmp117__ >> 12 & 0xff; + pDst->tbtt_info.tbtt_info_10.reserved = tmp117__ >> 20 & 0xfff; break; case 11: if (unlikely(ielen < 1)) { @@ -10610,13 +10622,13 @@ uint32_t dot11f_unpack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, return DOT11F_INCOMPLETE_IE; } - framesntohl(pCtx, &tmp117__, pBuf, 0); + framesntohl(pCtx, &tmp118__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->tbtt_info.tbtt_info_16.mld_id = tmp117__ >> 0 & 0xff; - pDst->tbtt_info.tbtt_info_16.link_id = tmp117__ >> 8 & 0xf; - pDst->tbtt_info.tbtt_info_16.bss_param_change_cnt = tmp117__ >> 12 & 0xff; - pDst->tbtt_info.tbtt_info_16.reserved = tmp117__ >> 20 & 0xfff; + pDst->tbtt_info.tbtt_info_16.mld_id = tmp118__ >> 0 & 0xff; + pDst->tbtt_info.tbtt_info_16.link_id = tmp118__ >> 8 & 0xf; + pDst->tbtt_info.tbtt_info_16.bss_param_change_cnt = tmp118__ >> 12 & 0xff; + pDst->tbtt_info.tbtt_info_16.reserved = tmp118__ >> 20 & 0xfff; break; } (void)pCtx; @@ -10947,7 +10959,7 @@ static const tIEDefn IES_AssocRequest[] = { "dh_parameter_element", 0, 4, 259, SigIedh_parameter_element, {0, 0, 0, 0, 0}, 0, DOT11F_EID_DH_PARAMETER_ELEMENT, 32, 0, }, { offsetof(tDot11fAssocRequest, eht_cap), offsetof(tDot11fIEeht_cap, - present), 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fAssocRequest, mlo_ie), offsetof(tDot11fIEmlo_ie, present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0}, @@ -11138,7 +11150,7 @@ static const tIEDefn IES_AssocResponse[] = { present), 0, "fils_kde", 0, 10, 265, SigIefils_kde, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FILS_KDE, 7, 0, }, { offsetof(tDot11fAssocResponse, eht_cap), offsetof(tDot11fIEeht_cap, - present), 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fAssocResponse, eht_op), offsetof(tDot11fIEeht_op, present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0}, @@ -11445,7 +11457,7 @@ static const tIEDefn IES_Beacon[] = { "WiderBWChanSwitchAnn", 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, 0, }, { offsetof(tDot11fBeacon, eht_cap), offsetof(tDot11fIEeht_cap, present), 0, - "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fBeacon, eht_op), offsetof(tDot11fIEeht_op, present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0}, @@ -11697,7 +11709,7 @@ static const tIEDefn IES_Beacon2[] = { "WiderBWChanSwitchAnn", 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, 0, }, { offsetof(tDot11fBeacon2, eht_cap), offsetof(tDot11fIEeht_cap, present), - 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fBeacon2, eht_op), offsetof(tDot11fIEeht_op, present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0}, @@ -11940,7 +11952,7 @@ static const tIEDefn IES_BeaconIEs[] = { "WiderBWChanSwitchAnn", 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, 0, }, { offsetof(tDot11fBeaconIEs, eht_cap), offsetof(tDot11fIEeht_cap, - present), 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fBeaconIEs, eht_op), offsetof(tDot11fIEeht_op, present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0}, @@ -12417,7 +12429,7 @@ static const tIEDefn IES_ProbeRequest[] = { 0, 4, 4, SigIehe_6ghz_band_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_HE_6GHZ_BAND_CAP, 59, 0, }, { offsetof(tDot11fProbeRequest, eht_cap), offsetof(tDot11fIEeht_cap, - present), 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fProbeRequest, mlo_ie), offsetof(tDot11fIEmlo_ie, present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0}, @@ -12616,7 +12628,7 @@ static const tIEDefn IES_ProbeResponse[] = { 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, 0, }, { offsetof(tDot11fProbeResponse, eht_cap), offsetof(tDot11fIEeht_cap, - present), 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fProbeResponse, eht_op), offsetof(tDot11fIEeht_op, present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0}, @@ -12897,7 +12909,7 @@ static const tIEDefn IES_ReAssocRequest[] = { 0, 12, 26, SigIeESECckmOpaque, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESECCKMOPAQUE, 0, 0, }, { offsetof(tDot11fReAssocRequest, eht_cap), offsetof(tDot11fIEeht_cap, - present), 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fReAssocRequest, mlo_ie), offsetof(tDot11fIEmlo_ie, present), 0, "mlo_ie", 0, 4, 276, SigIemlo_ie, {0, 0, 0, 0, 0}, @@ -13070,7 +13082,7 @@ static const tIEDefn IES_ReAssocResponse[] = { 0, 8, 8, SigIeESETxmitPower, {0, 64, 150, 0, 0}, 4, DOT11F_EID_ESETXMITPOWER, 0, 0, }, { offsetof(tDot11fReAssocResponse, eht_cap), offsetof(tDot11fIEeht_cap, - present), 0, "eht_cap", 0, 25, 87, SigIeeht_cap, {0, 0, 0, 0, 0}, + present), 0, "eht_cap", 0, 26, 88, SigIeeht_cap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EHT_CAP, 108, 0, }, { offsetof(tDot11fReAssocResponse, eht_op), offsetof(tDot11fIEeht_op, present), 0, "eht_op", 0, 6, 8, SigIeeht_op, {0, 0, 0, 0, 0}, @@ -17580,6 +17592,7 @@ uint32_t dot11f_get_packed_ie_eht_cap(tpAniSirGlobal pCtx, *pnNeeded += 2; *pnNeeded += 4; *pnNeeded += 4; + *pnNeeded += 1; *pnNeeded += 4; *pnNeeded += 4; *pnNeeded += 4; @@ -20070,25 +20083,25 @@ void dot11f_pack_ff_capabilities(tpAniSirGlobal pCtx, tDot11fFfCapabilities *pSrc, uint8_t *pBuf) { - uint16_t tmp118__; - tmp118__ = 0U; - tmp118__ |= (pSrc->ess << 0); - tmp118__ |= (pSrc->ibss << 1); - tmp118__ |= (pSrc->cfPollable << 2); - tmp118__ |= (pSrc->cfPollReq << 3); - tmp118__ |= (pSrc->privacy << 4); - tmp118__ |= (pSrc->shortPreamble << 5); - tmp118__ |= (pSrc->criticalUpdateFlag << 6); - tmp118__ |= (pSrc->channelAgility << 7); - tmp118__ |= (pSrc->spectrumMgt << 8); - tmp118__ |= (pSrc->qos << 9); - tmp118__ |= (pSrc->shortSlotTime << 10); - tmp118__ |= (pSrc->apsd << 11); - tmp118__ |= (pSrc->rrm << 12); - tmp118__ |= (pSrc->dsssOfdm << 13); - tmp118__ |= (pSrc->delayedBA << 14); - tmp118__ |= (pSrc->immediateBA << 15); - frameshtons(pCtx, pBuf, tmp118__, 0); + uint16_t tmp119__; + tmp119__ = 0U; + tmp119__ |= (pSrc->ess << 0); + tmp119__ |= (pSrc->ibss << 1); + tmp119__ |= (pSrc->cfPollable << 2); + tmp119__ |= (pSrc->cfPollReq << 3); + tmp119__ |= (pSrc->privacy << 4); + tmp119__ |= (pSrc->shortPreamble << 5); + tmp119__ |= (pSrc->criticalUpdateFlag << 6); + tmp119__ |= (pSrc->channelAgility << 7); + tmp119__ |= (pSrc->spectrumMgt << 8); + tmp119__ |= (pSrc->qos << 9); + tmp119__ |= (pSrc->shortSlotTime << 10); + tmp119__ |= (pSrc->apsd << 11); + tmp119__ |= (pSrc->rrm << 12); + tmp119__ |= (pSrc->dsssOfdm << 13); + tmp119__ |= (pSrc->delayedBA << 14); + tmp119__ |= (pSrc->immediateBA << 15); + frameshtons(pCtx, pBuf, tmp119__, 0); (void)pCtx; } /* End dot11f_pack_ff_capabilities. */ @@ -20152,13 +20165,13 @@ void dot11f_pack_ff_operating_mode(tpAniSirGlobal pCtx, tDot11fFfOperatingMode *pSrc, uint8_t *pBuf) { - uint8_t tmp119__; - tmp119__ = 0U; - tmp119__ |= (pSrc->chanWidth << 0); - tmp119__ |= (pSrc->reserved << 2); - tmp119__ |= (pSrc->rxNSS << 4); - tmp119__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp119__; + uint8_t tmp120__; + tmp120__ = 0U; + tmp120__ |= (pSrc->chanWidth << 0); + tmp120__ |= (pSrc->reserved << 2); + tmp120__ |= (pSrc->rxNSS << 4); + tmp120__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp120__; (void)pCtx; } /* End dot11f_pack_ff_operating_mode. */ @@ -20198,12 +20211,12 @@ void dot11f_pack_ff_sm_power_mode_set(tpAniSirGlobal pCtx, tDot11fFfSMPowerModeSet *pSrc, uint8_t *pBuf) { - uint8_t tmp120__; - tmp120__ = 0U; - tmp120__ |= (pSrc->PowerSave_En << 0); - tmp120__ |= (pSrc->Mode << 1); - tmp120__ |= (pSrc->reserved << 2); - *pBuf = tmp120__; + uint8_t tmp121__; + tmp121__ = 0U; + tmp121__ |= (pSrc->PowerSave_En << 0); + tmp121__ |= (pSrc->Mode << 1); + tmp121__ |= (pSrc->reserved << 2); + *pBuf = tmp121__; (void)pCtx; } /* End dot11f_pack_ff_sm_power_mode_set. */ @@ -20243,19 +20256,19 @@ void dot11f_pack_ff_ts_info(tpAniSirGlobal pCtx, tDot11fFfTSInfo *pSrc, uint8_t *pBuf) { - uint32_t tmp121__; - tmp121__ = 0U; - tmp121__ |= (pSrc->traffic_type << 0); - tmp121__ |= (pSrc->tsid << 1); - tmp121__ |= (pSrc->direction << 5); - tmp121__ |= (pSrc->access_policy << 7); - tmp121__ |= (pSrc->aggregation << 9); - tmp121__ |= (pSrc->psb << 10); - tmp121__ |= (pSrc->user_priority << 11); - tmp121__ |= (pSrc->tsinfo_ack_pol << 14); - tmp121__ |= (pSrc->schedule << 16); - tmp121__ |= (pSrc->unused << 17); - frameshtonl(pCtx, pBuf, tmp121__, 0); + uint32_t tmp122__; + tmp122__ = 0U; + tmp122__ |= (pSrc->traffic_type << 0); + tmp122__ |= (pSrc->tsid << 1); + tmp122__ |= (pSrc->direction << 5); + tmp122__ |= (pSrc->access_policy << 7); + tmp122__ |= (pSrc->aggregation << 9); + tmp122__ |= (pSrc->psb << 10); + tmp122__ |= (pSrc->user_priority << 11); + tmp122__ |= (pSrc->tsinfo_ack_pol << 14); + tmp122__ |= (pSrc->schedule << 16); + tmp122__ |= (pSrc->unused << 17); + frameshtonl(pCtx, pBuf, tmp122__, 0); (void)pCtx; } /* End dot11f_pack_ff_ts_info. */ @@ -20311,13 +20324,13 @@ void dot11f_pack_ff_addba_param_set(tpAniSirGlobal pCtx, tDot11fFfaddba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp122__; - tmp122__ = 0U; - tmp122__ |= (pSrc->amsdu_supp << 0); - tmp122__ |= (pSrc->policy << 1); - tmp122__ |= (pSrc->tid << 2); - tmp122__ |= (pSrc->buff_size << 6); - frameshtons(pCtx, pBuf, tmp122__, 0); + uint16_t tmp123__; + tmp123__ = 0U; + tmp123__ |= (pSrc->amsdu_supp << 0); + tmp123__ |= (pSrc->policy << 1); + tmp123__ |= (pSrc->tid << 2); + tmp123__ |= (pSrc->buff_size << 6); + frameshtons(pCtx, pBuf, tmp123__, 0); (void)pCtx; } /* End dot11f_pack_ff_addba_param_set. */ @@ -20325,11 +20338,11 @@ void dot11f_pack_ff_ba_start_seq_ctrl(tpAniSirGlobal pCtx, tDot11fFfba_start_seq_ctrl *pSrc, uint8_t *pBuf) { - uint16_t tmp123__; - tmp123__ = 0U; - tmp123__ |= (pSrc->frag_number << 0); - tmp123__ |= (pSrc->ssn << 4); - frameshtons(pCtx, pBuf, tmp123__, 0); + uint16_t tmp124__; + tmp124__ = 0U; + tmp124__ |= (pSrc->frag_number << 0); + tmp124__ |= (pSrc->ssn << 4); + frameshtons(pCtx, pBuf, tmp124__, 0); (void)pCtx; } /* End dot11f_pack_ff_ba_start_seq_ctrl. */ @@ -20345,12 +20358,12 @@ void dot11f_pack_ff_delba_param_set(tpAniSirGlobal pCtx, tDot11fFfdelba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp124__; - tmp124__ = 0U; - tmp124__ |= (pSrc->reserved << 0); - tmp124__ |= (pSrc->initiator << 11); - tmp124__ |= (pSrc->tid << 12); - frameshtons(pCtx, pBuf, tmp124__, 0); + uint16_t tmp125__; + tmp125__ = 0U; + tmp125__ |= (pSrc->reserved << 0); + tmp125__ |= (pSrc->initiator << 11); + tmp125__ |= (pSrc->tid << 12); + frameshtons(pCtx, pBuf, tmp125__, 0); (void)pCtx; } /* End dot11f_pack_ff_delba_param_set. */ @@ -20358,13 +20371,13 @@ void dot11f_pack_ff_ext_chan_switch_ann_action(tpAniSirGlobal pCtx, tDot11fFfext_chan_switch_ann_action *pSrc, uint8_t *pBuf) { - uint32_t tmp125__; - tmp125__ = 0U; - tmp125__ |= (pSrc->switch_mode << 0); - tmp125__ |= (pSrc->op_class << 8); - tmp125__ |= (pSrc->new_channel << 16); - tmp125__ |= (pSrc->switch_count << 24); - frameshtonl(pCtx, pBuf, tmp125__, 0); + uint32_t tmp126__; + tmp126__ = 0U; + tmp126__ |= (pSrc->switch_mode << 0); + tmp126__ |= (pSrc->op_class << 8); + tmp126__ |= (pSrc->new_channel << 16); + tmp126__ |= (pSrc->switch_count << 24); + frameshtonl(pCtx, pBuf, tmp126__, 0); (void)pCtx; } /* End dot11f_pack_ff_ext_chan_switch_ann_action. */ @@ -20467,7 +20480,7 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp126__; + uint8_t tmp127__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -20476,13 +20489,13 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp126__ = 0U; - tmp126__ |= (pSrc->minor << 0); - tmp126__ |= (pSrc->major << 4); + tmp127__ = 0U; + tmp127__ |= (pSrc->minor << 0); + tmp127__ |= (pSrc->major << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp126__; + *pBuf = tmp127__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -21439,7 +21452,7 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp127__; + uint8_t tmp128__; nNeeded += 5; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -21448,13 +21461,13 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, pBuf += 2; *pnConsumed += 2; pTlvLen = pBuf; pBuf += 2; *pnConsumed += 2; - tmp127__ = 0U; - tmp127__ |= (pSrc->minor << 0); - tmp127__ |= (pSrc->major << 4); + tmp128__ = 0U; + tmp128__ |= (pSrc->minor << 0); + tmp128__ |= (pSrc->major << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp127__; + *pBuf = tmp128__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -21837,7 +21850,7 @@ uint32_t dot11f_pack_tlv_oce_cap(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp128__; + uint8_t tmp129__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -21846,15 +21859,15 @@ uint32_t dot11f_pack_tlv_oce_cap(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp128__ = 0U; - tmp128__ |= (pSrc->oce_release << 0); - tmp128__ |= (pSrc->is_sta_cfon << 3); - tmp128__ |= (pSrc->non_oce_ap_present << 4); - tmp128__ |= (pSrc->reserved << 5); + tmp129__ = 0U; + tmp129__ |= (pSrc->oce_release << 0); + tmp129__ |= (pSrc->is_sta_cfon << 3); + tmp129__ |= (pSrc->non_oce_ap_present << 4); + tmp129__ |= (pSrc->reserved << 5); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp128__; + *pBuf = tmp129__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -21908,7 +21921,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 tmp129__; + uint8_t tmp130__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -21917,13 +21930,13 @@ uint32_t dot11f_pack_tlv_reduced_wan_metrics(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp129__ = 0U; - tmp129__ |= (pSrc->downlink_av_cap << 0); - tmp129__ |= (pSrc->uplink_av_cap << 4); + tmp130__ = 0U; + tmp130__ |= (pSrc->downlink_av_cap << 0); + tmp130__ |= (pSrc->uplink_av_cap << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp129__; + *pBuf = tmp130__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -22180,7 +22193,7 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp130__; + uint16_t tmp131__; nNeeded += (pSrc->num_key + 11); while (pSrc->present) { if (nNeeded > nBuf) @@ -22189,13 +22202,13 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp130__ = 0U; - tmp130__ |= (pSrc->keyId << 0); - tmp130__ |= (pSrc->reserved << 2); + tmp131__ = 0U; + tmp131__ |= (pSrc->keyId << 0); + tmp131__ |= (pSrc->reserved << 2); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp130__, 0); + frameshtons(pCtx, pBuf, tmp131__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -22604,11 +22617,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 tmp131__; uint8_t tmp132__; uint8_t tmp133__; uint8_t tmp134__; uint8_t tmp135__; + uint8_t tmp136__; nNeeded += 5; while (pSrc->present) { if (nNeeded > nBuf) @@ -22617,31 +22630,15 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp131__ = 0U; - tmp131__ |= (pSrc->LinkMeasurement << 0); - tmp131__ |= (pSrc->NeighborRpt << 1); - tmp131__ |= (pSrc->parallel << 2); - tmp131__ |= (pSrc->repeated << 3); - tmp131__ |= (pSrc->BeaconPassive << 4); - tmp131__ |= (pSrc->BeaconActive << 5); - tmp131__ |= (pSrc->BeaconTable << 6); - tmp131__ |= (pSrc->BeaconRepCond << 7); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp131__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp132__ = 0U; - tmp132__ |= (pSrc->FrameMeasurement << 0); - tmp132__ |= (pSrc->ChannelLoad << 1); - tmp132__ |= (pSrc->NoiseHistogram << 2); - tmp132__ |= (pSrc->statistics << 3); - tmp132__ |= (pSrc->LCIMeasurement << 4); - tmp132__ |= (pSrc->LCIAzimuth << 5); - tmp132__ |= (pSrc->TCMCapability << 6); - tmp132__ |= (pSrc->triggeredTCM << 7); + tmp132__ |= (pSrc->LinkMeasurement << 0); + tmp132__ |= (pSrc->NeighborRpt << 1); + tmp132__ |= (pSrc->parallel << 2); + tmp132__ |= (pSrc->repeated << 3); + tmp132__ |= (pSrc->BeaconPassive << 4); + tmp132__ |= (pSrc->BeaconActive << 5); + tmp132__ |= (pSrc->BeaconTable << 6); + tmp132__ |= (pSrc->BeaconRepCond << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -22650,10 +22647,14 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, pBuf += 1; nBuf -= 1 ; tmp133__ = 0U; - tmp133__ |= (pSrc->APChanReport << 0); - tmp133__ |= (pSrc->RRMMIBEnabled << 1); - tmp133__ |= (pSrc->operatingChanMax << 2); - tmp133__ |= (pSrc->nonOperatinChanMax << 5); + tmp133__ |= (pSrc->FrameMeasurement << 0); + tmp133__ |= (pSrc->ChannelLoad << 1); + tmp133__ |= (pSrc->NoiseHistogram << 2); + tmp133__ |= (pSrc->statistics << 3); + tmp133__ |= (pSrc->LCIMeasurement << 4); + tmp133__ |= (pSrc->LCIAzimuth << 5); + tmp133__ |= (pSrc->TCMCapability << 6); + tmp133__ |= (pSrc->triggeredTCM << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -22662,12 +22663,10 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, pBuf += 1; nBuf -= 1 ; tmp134__ = 0U; - tmp134__ |= (pSrc->MeasurementPilot << 0); - tmp134__ |= (pSrc->MeasurementPilotEnabled << 3); - tmp134__ |= (pSrc->NeighborTSFOffset << 4); - tmp134__ |= (pSrc->RCPIMeasurement << 5); - tmp134__ |= (pSrc->RSNIMeasurement << 6); - tmp134__ |= (pSrc->BssAvgAccessDelay << 7); + tmp134__ |= (pSrc->APChanReport << 0); + tmp134__ |= (pSrc->RRMMIBEnabled << 1); + tmp134__ |= (pSrc->operatingChanMax << 2); + tmp134__ |= (pSrc->nonOperatinChanMax << 5); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -22676,16 +22675,30 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, pBuf += 1; nBuf -= 1 ; tmp135__ = 0U; - tmp135__ |= (pSrc->BSSAvailAdmission << 0); - tmp135__ |= (pSrc->AntennaInformation << 1); - tmp135__ |= (pSrc->fine_time_meas_rpt << 2); - tmp135__ |= (pSrc->lci_capability << 3); - tmp135__ |= (pSrc->reserved << 4); + tmp135__ |= (pSrc->MeasurementPilot << 0); + tmp135__ |= (pSrc->MeasurementPilotEnabled << 3); + tmp135__ |= (pSrc->NeighborTSFOffset << 4); + tmp135__ |= (pSrc->RCPIMeasurement << 5); + tmp135__ |= (pSrc->RSNIMeasurement << 6); + tmp135__ |= (pSrc->BssAvgAccessDelay << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; *pBuf = tmp135__; *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp136__ = 0U; + tmp136__ |= (pSrc->BSSAvailAdmission << 0); + tmp136__ |= (pSrc->AntennaInformation << 1); + tmp136__ |= (pSrc->fine_time_meas_rpt << 2); + tmp136__ |= (pSrc->lci_capability << 3); + tmp136__ |= (pSrc->reserved << 4); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp136__; + *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; break; @@ -22764,7 +22777,7 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp136__; + uint16_t tmp137__; nNeeded += 14; while (pSrc->present) { if (nNeeded > nBuf) @@ -22773,15 +22786,15 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp136__ = 0U; - tmp136__ |= (pSrc->aggregation << 0); - tmp136__ |= (pSrc->tsid << 1); - tmp136__ |= (pSrc->direction << 5); - tmp136__ |= (pSrc->reserved << 7); + tmp137__ = 0U; + tmp137__ |= (pSrc->aggregation << 0); + tmp137__ |= (pSrc->tsid << 1); + tmp137__ |= (pSrc->direction << 5); + tmp137__ |= (pSrc->reserved << 7); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp136__, 0); + frameshtons(pCtx, pBuf, tmp137__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -23008,9 +23021,9 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp137__; - uint8_t tmp138__; - uint16_t tmp139__; + uint16_t tmp138__; + uint8_t tmp139__; + uint16_t tmp140__; nNeeded += 55; while (pSrc->present) { if (nNeeded > nBuf) @@ -23019,39 +23032,39 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp137__ = 0U; - tmp137__ |= (pSrc->traffic_type << 0); - tmp137__ |= (pSrc->tsid << 1); - tmp137__ |= (pSrc->direction << 5); - tmp137__ |= (pSrc->access_policy << 7); - tmp137__ |= (pSrc->aggregation << 9); - tmp137__ |= (pSrc->psb << 10); - tmp137__ |= (pSrc->user_priority << 11); - tmp137__ |= (pSrc->tsinfo_ack_pol << 14); + tmp138__ = 0U; + tmp138__ |= (pSrc->traffic_type << 0); + tmp138__ |= (pSrc->tsid << 1); + tmp138__ |= (pSrc->direction << 5); + tmp138__ |= (pSrc->access_policy << 7); + tmp138__ |= (pSrc->aggregation << 9); + tmp138__ |= (pSrc->psb << 10); + tmp138__ |= (pSrc->user_priority << 11); + tmp138__ |= (pSrc->tsinfo_ack_pol << 14); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp137__, 0); + frameshtons(pCtx, pBuf, tmp138__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp138__ = 0U; - tmp138__ |= (pSrc->schedule << 0); - tmp138__ |= (pSrc->unused << 1); + tmp139__ = 0U; + tmp139__ |= (pSrc->schedule << 0); + tmp139__ |= (pSrc->unused << 1); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp138__; + *pBuf = tmp139__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp139__ = 0U; - tmp139__ |= (pSrc->size << 0); - tmp139__ |= (pSrc->fixed << 15); + tmp140__ = 0U; + tmp140__ |= (pSrc->size << 0); + tmp140__ |= (pSrc->fixed << 15); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp139__, 0); + frameshtons(pCtx, pBuf, tmp140__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -23115,9 +23128,9 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp140__; - uint16_t tmp141__; + uint32_t tmp141__; uint16_t tmp142__; + uint16_t tmp143__; nNeeded += 12; while (pSrc->present) { if (nNeeded > nBuf) @@ -23126,58 +23139,58 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp140__ = 0U; - tmp140__ |= (pSrc->maxMPDULen << 0); - tmp140__ |= (pSrc->supportedChannelWidthSet << 2); - tmp140__ |= (pSrc->ldpcCodingCap << 4); - tmp140__ |= (pSrc->shortGI80MHz << 5); - tmp140__ |= (pSrc->shortGI160and80plus80MHz << 6); - tmp140__ |= (pSrc->txSTBC << 7); - tmp140__ |= (pSrc->rxSTBC << 8); - tmp140__ |= (pSrc->suBeamFormerCap << 11); - tmp140__ |= (pSrc->suBeamformeeCap << 12); - tmp140__ |= (pSrc->csnofBeamformerAntSup << 13); - tmp140__ |= (pSrc->numSoundingDim << 16); - tmp140__ |= (pSrc->muBeamformerCap << 19); - tmp140__ |= (pSrc->muBeamformeeCap << 20); - tmp140__ |= (pSrc->vhtTXOPPS << 21); - tmp140__ |= (pSrc->htcVHTCap << 22); - tmp140__ |= (pSrc->maxAMPDULenExp << 23); - tmp140__ |= (pSrc->vhtLinkAdaptCap << 26); - tmp140__ |= (pSrc->rxAntPattern << 28); - tmp140__ |= (pSrc->txAntPattern << 29); - tmp140__ |= (pSrc->extended_nss_bw_supp << 30); + tmp141__ = 0U; + tmp141__ |= (pSrc->maxMPDULen << 0); + tmp141__ |= (pSrc->supportedChannelWidthSet << 2); + tmp141__ |= (pSrc->ldpcCodingCap << 4); + tmp141__ |= (pSrc->shortGI80MHz << 5); + tmp141__ |= (pSrc->shortGI160and80plus80MHz << 6); + tmp141__ |= (pSrc->txSTBC << 7); + tmp141__ |= (pSrc->rxSTBC << 8); + tmp141__ |= (pSrc->suBeamFormerCap << 11); + tmp141__ |= (pSrc->suBeamformeeCap << 12); + tmp141__ |= (pSrc->csnofBeamformerAntSup << 13); + tmp141__ |= (pSrc->numSoundingDim << 16); + tmp141__ |= (pSrc->muBeamformerCap << 19); + tmp141__ |= (pSrc->muBeamformeeCap << 20); + tmp141__ |= (pSrc->vhtTXOPPS << 21); + tmp141__ |= (pSrc->htcVHTCap << 22); + tmp141__ |= (pSrc->maxAMPDULenExp << 23); + tmp141__ |= (pSrc->vhtLinkAdaptCap << 26); + tmp141__ |= (pSrc->rxAntPattern << 28); + tmp141__ |= (pSrc->txAntPattern << 29); + tmp141__ |= (pSrc->extended_nss_bw_supp << 30); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; - frameshtonl(pCtx, pBuf, tmp140__, 0); + frameshtonl(pCtx, pBuf, tmp141__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp141__ = 0U; - tmp141__ |= (pSrc->rxHighSupDataRate << 0); - tmp141__ |= (pSrc->max_nsts_total << 13); + tmp142__ = 0U; + tmp142__ |= (pSrc->rxHighSupDataRate << 0); + tmp142__ |= (pSrc->max_nsts_total << 13); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp141__, 0); + frameshtons(pCtx, pBuf, tmp142__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp142__ = 0U; - tmp142__ |= (pSrc->txSupDataRate << 0); - tmp142__ |= (pSrc->vht_extended_nss_bw_cap << 13); - tmp142__ |= (pSrc->reserved << 14); + tmp143__ = 0U; + tmp143__ |= (pSrc->txSupDataRate << 0); + tmp143__ |= (pSrc->vht_extended_nss_bw_cap << 13); + tmp143__ |= (pSrc->reserved << 14); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp142__, 0); + frameshtons(pCtx, pBuf, tmp143__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -23237,7 +23250,7 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp143__; + uint16_t tmp144__; nNeeded += 15; while (pSrc->present) { if (nNeeded > nBuf) @@ -23259,15 +23272,15 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp143__ = 0U; - tmp143__ |= (pSrc->aggregation << 0); - tmp143__ |= (pSrc->tsid << 1); - tmp143__ |= (pSrc->direction << 5); - tmp143__ |= (pSrc->reserved << 7); + tmp144__ = 0U; + tmp144__ |= (pSrc->aggregation << 0); + tmp144__ |= (pSrc->tsid << 1); + tmp144__ |= (pSrc->direction << 5); + tmp144__ |= (pSrc->reserved << 7); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp143__, 0); + frameshtons(pCtx, pBuf, tmp144__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -23501,9 +23514,9 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp144__; - uint8_t tmp145__; - uint16_t tmp146__; + uint16_t tmp145__; + uint8_t tmp146__; + uint16_t tmp147__; nNeeded += 38; while (pSrc->present) { if (nNeeded > nBuf) @@ -23525,39 +23538,39 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp144__ = 0U; - tmp144__ |= (pSrc->traffic_type << 0); - tmp144__ |= (pSrc->tsid << 1); - tmp144__ |= (pSrc->direction << 5); - tmp144__ |= (pSrc->access_policy << 7); - tmp144__ |= (pSrc->aggregation << 9); - tmp144__ |= (pSrc->psb << 10); - tmp144__ |= (pSrc->user_priority << 11); - tmp144__ |= (pSrc->tsinfo_ack_pol << 14); + tmp145__ = 0U; + tmp145__ |= (pSrc->traffic_type << 0); + tmp145__ |= (pSrc->tsid << 1); + tmp145__ |= (pSrc->direction << 5); + tmp145__ |= (pSrc->access_policy << 7); + tmp145__ |= (pSrc->aggregation << 9); + tmp145__ |= (pSrc->psb << 10); + tmp145__ |= (pSrc->user_priority << 11); + tmp145__ |= (pSrc->tsinfo_ack_pol << 14); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp144__, 0); + frameshtons(pCtx, pBuf, tmp145__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp145__ = 0U; - tmp145__ |= (pSrc->tsinfo_rsvd << 0); - tmp145__ |= (pSrc->burst_size_defn << 7); + tmp146__ = 0U; + tmp146__ |= (pSrc->tsinfo_rsvd << 0); + tmp146__ |= (pSrc->burst_size_defn << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp145__; + *pBuf = tmp146__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp146__ = 0U; - tmp146__ |= (pSrc->size << 0); - tmp146__ |= (pSrc->fixed << 15); + tmp147__ = 0U; + tmp147__ |= (pSrc->size << 0); + tmp147__ |= (pSrc->fixed << 15); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp146__, 0); + frameshtons(pCtx, pBuf, tmp147__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -23685,7 +23698,7 @@ uint32_t dot11f_pack_ie_beacon_report_frm_body_fragment_id(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp147__; + uint16_t tmp148__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -23694,14 +23707,14 @@ uint32_t dot11f_pack_ie_beacon_report_frm_body_fragment_id(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp147__ = 0U; - tmp147__ |= (pSrc->beacon_report_id << 0); - tmp147__ |= (pSrc->fragment_id_number << 8); - tmp147__ |= (pSrc->more_fragments << 15); + tmp148__ = 0U; + tmp148__ |= (pSrc->beacon_report_id << 0); + tmp148__ |= (pSrc->fragment_id_number << 8); + tmp148__ |= (pSrc->more_fragments << 15); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp147__, 0); + frameshtons(pCtx, pBuf, tmp148__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -23810,8 +23823,8 @@ uint32_t dot11f_pack_ie_neighbor_rpt(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_rpt(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23826,26 +23839,14 @@ uint32_t dot11f_pack_ie_neighbor_rpt(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); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp148__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp149__ = 0U; - tmp149__ |= (pSrc->DelayedBA << 0); - tmp149__ |= (pSrc->ImmBA << 1); - tmp149__ |= (pSrc->MobilityDomain << 2); - tmp149__ |= (pSrc->reserved << 3); + 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); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -23853,6 +23854,18 @@ uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + tmp150__ = 0U; + tmp150__ |= (pSrc->DelayedBA << 0); + tmp150__ |= (pSrc->ImmBA << 1); + tmp150__ |= (pSrc->MobilityDomain << 2); + tmp150__ |= (pSrc->reserved << 3); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp150__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->reserved1, 0); *pnConsumed += 2; pBuf += 2; @@ -24021,7 +24034,7 @@ uint32_t dot11f_pack_ie_transmit_power_env(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp150__; + uint8_t tmp151__; nNeeded += (pSrc->num_tx_power + 1); while (pSrc->present) { if (nNeeded > nBuf) @@ -24030,14 +24043,14 @@ uint32_t dot11f_pack_ie_transmit_power_env(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp150__ = 0U; - tmp150__ |= (pSrc->max_tx_pwr_count << 0); - tmp150__ |= (pSrc->max_tx_pwr_interpret << 3); - tmp150__ |= (pSrc->max_tx_pwr_category << 6); + tmp151__ = 0U; + tmp151__ |= (pSrc->max_tx_pwr_count << 0); + tmp151__ |= (pSrc->max_tx_pwr_interpret << 3); + tmp151__ |= (pSrc->max_tx_pwr_category << 6); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp150__; + *pBuf = tmp151__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -24300,7 +24313,6 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp151__; uint8_t tmp152__; uint8_t tmp153__; uint8_t tmp154__; @@ -24308,6 +24320,7 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp156__; uint8_t tmp157__; uint8_t tmp158__; + uint8_t tmp159__; nNeeded += 18; while (pSrc->present) { if (nNeeded > nBuf) @@ -24322,21 +24335,11 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; - tmp151__ = 0U; - tmp151__ |= (pSrc->acbe_aifsn << 0); - tmp151__ |= (pSrc->acbe_acm << 4); - tmp151__ |= (pSrc->acbe_aci << 5); - tmp151__ |= (pSrc->unused1 << 7); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp151__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp152__ = 0U; - tmp152__ |= (pSrc->acbe_acwmin << 0); - tmp152__ |= (pSrc->acbe_acwmax << 4); + tmp152__ |= (pSrc->acbe_aifsn << 0); + tmp152__ |= (pSrc->acbe_acm << 4); + tmp152__ |= (pSrc->acbe_aci << 5); + tmp152__ |= (pSrc->unused1 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -24344,14 +24347,9 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp153__ = 0U; - tmp153__ |= (pSrc->acbk_aifsn << 0); - tmp153__ |= (pSrc->acbk_acm << 4); - tmp153__ |= (pSrc->acbk_aci << 5); - tmp153__ |= (pSrc->unused2 << 7); + tmp153__ |= (pSrc->acbe_acwmin << 0); + tmp153__ |= (pSrc->acbe_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -24359,9 +24357,14 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp154__ = 0U; - tmp154__ |= (pSrc->acbk_acwmin << 0); - tmp154__ |= (pSrc->acbk_acwmax << 4); + tmp154__ |= (pSrc->acbk_aifsn << 0); + tmp154__ |= (pSrc->acbk_acm << 4); + tmp154__ |= (pSrc->acbk_aci << 5); + tmp154__ |= (pSrc->unused2 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -24369,14 +24372,9 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp155__ = 0U; - tmp155__ |= (pSrc->acvi_aifsn << 0); - tmp155__ |= (pSrc->acvi_acm << 4); - tmp155__ |= (pSrc->acvi_aci << 5); - tmp155__ |= (pSrc->unused3 << 7); + tmp155__ |= (pSrc->acbk_acwmin << 0); + tmp155__ |= (pSrc->acbk_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -24384,9 +24382,14 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp156__ = 0U; - tmp156__ |= (pSrc->acvi_acwmin << 0); - tmp156__ |= (pSrc->acvi_acwmax << 4); + tmp156__ |= (pSrc->acvi_aifsn << 0); + tmp156__ |= (pSrc->acvi_acm << 4); + tmp156__ |= (pSrc->acvi_aci << 5); + tmp156__ |= (pSrc->unused3 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -24394,14 +24397,9 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp157__ = 0U; - tmp157__ |= (pSrc->acvo_aifsn << 0); - tmp157__ |= (pSrc->acvo_acm << 4); - tmp157__ |= (pSrc->acvo_aci << 5); - tmp157__ |= (pSrc->unused4 << 7); + tmp157__ |= (pSrc->acvi_acwmin << 0); + tmp157__ |= (pSrc->acvi_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -24409,9 +24407,14 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp158__ = 0U; - tmp158__ |= (pSrc->acvo_acwmin << 0); - tmp158__ |= (pSrc->acvo_acwmax << 4); + tmp158__ |= (pSrc->acvo_aifsn << 0); + tmp158__ |= (pSrc->acvo_acm << 4); + tmp158__ |= (pSrc->acvo_aci << 5); + tmp158__ |= (pSrc->unused4 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -24419,6 +24422,16 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + tmp159__ = 0U; + tmp159__ |= (pSrc->acvo_acwmin << 0); + tmp159__ |= (pSrc->acvo_acwmax << 4); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp159__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvo_txoplimit, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ @@ -24440,7 +24453,7 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp159__; + uint8_t tmp160__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -24449,15 +24462,15 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp159__ = 0U; - tmp159__ |= (pSrc->non_erp_present << 0); - tmp159__ |= (pSrc->use_prot << 1); - tmp159__ |= (pSrc->barker_preamble << 2); - tmp159__ |= (pSrc->unused << 3); + tmp160__ = 0U; + tmp160__ |= (pSrc->non_erp_present << 0); + tmp160__ |= (pSrc->use_prot << 1); + tmp160__ |= (pSrc->barker_preamble << 2); + tmp160__ |= (pSrc->unused << 3); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp159__; + *pBuf = tmp160__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -24516,7 +24529,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 tmp160__; + uint8_t tmp161__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -24536,13 +24549,13 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, *pBuf = pSrc->mgmt_state; *pnConsumed += 1; pBuf += 1; - tmp160__ = 0U; - tmp160__ |= (pSrc->mbssid_mask << 0); - tmp160__ |= (pSrc->reserved << 3); + tmp161__ = 0U; + tmp161__ |= (pSrc->mbssid_mask << 0); + tmp161__ |= (pSrc->reserved << 3); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp160__; + *pBuf = tmp161__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -24893,7 +24906,7 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp161__; + uint16_t tmp162__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ieft_info(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -24905,13 +24918,13 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; --nBuf; ++(*pnConsumed); - tmp161__ = 0U; - tmp161__ |= (pSrc->reserved << 0); - tmp161__ |= (pSrc->IECount << 8); + tmp162__ = 0U; + tmp162__ |= (pSrc->reserved << 0); + tmp162__ |= (pSrc->IECount << 8); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp161__, 0); + frameshtons(pCtx, pBuf, tmp162__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -24949,11 +24962,11 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp162__; - uint8_t tmp163__; - uint16_t tmp164__; - uint32_t tmp165__; - uint8_t tmp166__; + uint16_t tmp163__; + uint8_t tmp164__; + uint16_t tmp165__; + uint32_t tmp166__; + uint8_t tmp167__; nNeeded += (pSrc->num_rsvd + 26); while (pSrc->present) { if (nNeeded > nBuf) @@ -24962,92 +24975,92 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp162__ = 0U; - tmp162__ |= (pSrc->advCodingCap << 0); - tmp162__ |= (pSrc->supportedChannelWidthSet << 1); - tmp162__ |= (pSrc->mimoPowerSave << 2); - tmp162__ |= (pSrc->greenField << 4); - tmp162__ |= (pSrc->shortGI20MHz << 5); - tmp162__ |= (pSrc->shortGI40MHz << 6); - tmp162__ |= (pSrc->txSTBC << 7); - tmp162__ |= (pSrc->rxSTBC << 8); - tmp162__ |= (pSrc->delayedBA << 10); - tmp162__ |= (pSrc->maximalAMSDUsize << 11); - tmp162__ |= (pSrc->dsssCckMode40MHz << 12); - tmp162__ |= (pSrc->psmp << 13); - tmp162__ |= (pSrc->stbcControlFrame << 14); - tmp162__ |= (pSrc->lsigTXOPProtection << 15); + tmp163__ = 0U; + tmp163__ |= (pSrc->advCodingCap << 0); + tmp163__ |= (pSrc->supportedChannelWidthSet << 1); + tmp163__ |= (pSrc->mimoPowerSave << 2); + tmp163__ |= (pSrc->greenField << 4); + tmp163__ |= (pSrc->shortGI20MHz << 5); + tmp163__ |= (pSrc->shortGI40MHz << 6); + tmp163__ |= (pSrc->txSTBC << 7); + tmp163__ |= (pSrc->rxSTBC << 8); + tmp163__ |= (pSrc->delayedBA << 10); + tmp163__ |= (pSrc->maximalAMSDUsize << 11); + tmp163__ |= (pSrc->dsssCckMode40MHz << 12); + tmp163__ |= (pSrc->psmp << 13); + tmp163__ |= (pSrc->stbcControlFrame << 14); + tmp163__ |= (pSrc->lsigTXOPProtection << 15); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp162__, 0); + frameshtons(pCtx, pBuf, tmp163__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp163__ = 0U; - tmp163__ |= (pSrc->maxRxAMPDUFactor << 0); - tmp163__ |= (pSrc->mpduDensity << 2); - tmp163__ |= (pSrc->reserved1 << 5); + tmp164__ = 0U; + tmp164__ |= (pSrc->maxRxAMPDUFactor << 0); + tmp164__ |= (pSrc->mpduDensity << 2); + tmp164__ |= (pSrc->reserved1 << 5); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp163__; + *pBuf = tmp164__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16); *pnConsumed += 16; pBuf += 16; - tmp164__ = 0U; - tmp164__ |= (pSrc->pco << 0); - tmp164__ |= (pSrc->transitionTime << 1); - tmp164__ |= (pSrc->reserved2 << 3); - tmp164__ |= (pSrc->mcsFeedback << 8); - tmp164__ |= (pSrc->reserved3 << 10); + tmp165__ = 0U; + tmp165__ |= (pSrc->pco << 0); + tmp165__ |= (pSrc->transitionTime << 1); + tmp165__ |= (pSrc->reserved2 << 3); + tmp165__ |= (pSrc->mcsFeedback << 8); + tmp165__ |= (pSrc->reserved3 << 10); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp164__, 0); + frameshtons(pCtx, pBuf, tmp165__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp165__ = 0U; - tmp165__ |= (pSrc->txBF << 0); - tmp165__ |= (pSrc->rxStaggeredSounding << 1); - tmp165__ |= (pSrc->txStaggeredSounding << 2); - tmp165__ |= (pSrc->rxZLF << 3); - tmp165__ |= (pSrc->txZLF << 4); - tmp165__ |= (pSrc->implicitTxBF << 5); - tmp165__ |= (pSrc->calibration << 6); - tmp165__ |= (pSrc->explicitCSITxBF << 8); - tmp165__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); - tmp165__ |= (pSrc->explicitBFCSIFeedback << 10); - tmp165__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); - tmp165__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); - tmp165__ |= (pSrc->csiNumBFAntennae << 19); - tmp165__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); - tmp165__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); - tmp165__ |= (pSrc->reserved4 << 25); + tmp166__ = 0U; + tmp166__ |= (pSrc->txBF << 0); + tmp166__ |= (pSrc->rxStaggeredSounding << 1); + tmp166__ |= (pSrc->txStaggeredSounding << 2); + tmp166__ |= (pSrc->rxZLF << 3); + tmp166__ |= (pSrc->txZLF << 4); + tmp166__ |= (pSrc->implicitTxBF << 5); + tmp166__ |= (pSrc->calibration << 6); + tmp166__ |= (pSrc->explicitCSITxBF << 8); + tmp166__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); + tmp166__ |= (pSrc->explicitBFCSIFeedback << 10); + tmp166__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); + tmp166__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); + tmp166__ |= (pSrc->csiNumBFAntennae << 19); + tmp166__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); + tmp166__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); + tmp166__ |= (pSrc->reserved4 << 25); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; - frameshtonl(pCtx, pBuf, tmp165__, 0); + frameshtonl(pCtx, pBuf, tmp166__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp166__ = 0U; - tmp166__ |= (pSrc->antennaSelection << 0); - tmp166__ |= (pSrc->explicitCSIFeedbackTx << 1); - tmp166__ |= (pSrc->antennaIndicesFeedbackTx << 2); - tmp166__ |= (pSrc->explicitCSIFeedback << 3); - tmp166__ |= (pSrc->antennaIndicesFeedback << 4); - tmp166__ |= (pSrc->rxAS << 5); - tmp166__ |= (pSrc->txSoundingPPDUs << 6); - tmp166__ |= (pSrc->reserved5 << 7); + tmp167__ = 0U; + tmp167__ |= (pSrc->antennaSelection << 0); + tmp167__ |= (pSrc->explicitCSIFeedbackTx << 1); + tmp167__ |= (pSrc->antennaIndicesFeedbackTx << 2); + tmp167__ |= (pSrc->explicitCSIFeedback << 3); + tmp167__ |= (pSrc->antennaIndicesFeedback << 4); + tmp167__ |= (pSrc->rxAS << 5); + tmp167__ |= (pSrc->txSoundingPPDUs << 6); + tmp167__ |= (pSrc->reserved5 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp166__; + *pBuf = tmp167__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25072,9 +25085,9 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp167__; - uint16_t tmp168__; + uint8_t tmp168__; uint16_t tmp169__; + uint16_t tmp170__; nNeeded += (pSrc->num_rsvd + 22); while (pSrc->present) { if (nNeeded > nBuf) @@ -25086,41 +25099,26 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, *pBuf = pSrc->primaryChannel; *pnConsumed += 1; pBuf += 1; - tmp167__ = 0U; - tmp167__ |= (pSrc->secondaryChannelOffset << 0); - tmp167__ |= (pSrc->recommendedTxWidthSet << 2); - tmp167__ |= (pSrc->rifsMode << 3); - tmp167__ |= (pSrc->controlledAccessOnly << 4); - tmp167__ |= (pSrc->serviceIntervalGranularity << 5); + tmp168__ = 0U; + tmp168__ |= (pSrc->secondaryChannelOffset << 0); + tmp168__ |= (pSrc->recommendedTxWidthSet << 2); + tmp168__ |= (pSrc->rifsMode << 3); + tmp168__ |= (pSrc->controlledAccessOnly << 4); + tmp168__ |= (pSrc->serviceIntervalGranularity << 5); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp167__; + *pBuf = tmp168__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp168__ = 0U; - tmp168__ |= (pSrc->opMode << 0); - tmp168__ |= (pSrc->nonGFDevicesPresent << 2); - tmp168__ |= (pSrc->transmitBurstLimit << 3); - tmp168__ |= (pSrc->obssNonHTStaPresent << 4); - tmp168__ |= (pSrc->chan_center_freq_seg2 << 5); - tmp168__ |= (pSrc->reserved << 13); - if (unlikely(nBuf < 2)) - return DOT11F_INCOMPLETE_IE; - - frameshtons(pCtx, pBuf, tmp168__, 0); - *pnConsumed += 2; - pBuf += 2; - nBuf -= 2 ; tmp169__ = 0U; - tmp169__ |= (pSrc->basicSTBCMCS << 0); - tmp169__ |= (pSrc->dualCTSProtection << 7); - tmp169__ |= (pSrc->secondaryBeacon << 8); - tmp169__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); - tmp169__ |= (pSrc->pcoActive << 10); - tmp169__ |= (pSrc->pcoPhase << 11); - tmp169__ |= (pSrc->reserved2 << 12); + tmp169__ |= (pSrc->opMode << 0); + tmp169__ |= (pSrc->nonGFDevicesPresent << 2); + tmp169__ |= (pSrc->transmitBurstLimit << 3); + tmp169__ |= (pSrc->obssNonHTStaPresent << 4); + tmp169__ |= (pSrc->chan_center_freq_seg2 << 5); + tmp169__ |= (pSrc->reserved << 13); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; @@ -25128,6 +25126,21 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; + tmp170__ = 0U; + tmp170__ |= (pSrc->basicSTBCMCS << 0); + tmp170__ |= (pSrc->dualCTSProtection << 7); + tmp170__ |= (pSrc->secondaryBeacon << 8); + tmp170__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); + tmp170__ |= (pSrc->pcoActive << 10); + tmp170__ |= (pSrc->pcoPhase << 11); + tmp170__ |= (pSrc->reserved2 << 12); + if (unlikely(nBuf < 2)) + return DOT11F_INCOMPLETE_IE; + + frameshtons(pCtx, pBuf, tmp170__, 0); + *pnConsumed += 2; + pBuf += 2; + nBuf -= 2 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->basicMCSSet, 16); *pnConsumed += 16; pBuf += 16; @@ -25235,9 +25248,9 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp170__; uint8_t tmp171__; uint8_t tmp172__; + uint8_t tmp173__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -25252,15 +25265,15 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, *pBuf = pSrc->token; *pnConsumed += 1; pBuf += 1; - tmp170__ = 0U; - tmp170__ |= (pSrc->late << 0); - tmp170__ |= (pSrc->incapable << 1); - tmp170__ |= (pSrc->refused << 2); - tmp170__ |= (pSrc->unused << 3); + tmp171__ = 0U; + tmp171__ |= (pSrc->late << 0); + tmp171__ |= (pSrc->incapable << 1); + tmp171__ |= (pSrc->refused << 2); + tmp171__ |= (pSrc->unused << 3); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp170__; + *pBuf = tmp171__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25279,17 +25292,17 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp171__ = 0U; - tmp171__ |= (pSrc->report.Basic.bss << 0); - tmp171__ |= (pSrc->report.Basic.ofdm_preamble << 1); - tmp171__ |= (pSrc->report.Basic.unid_signal << 2); - tmp171__ |= (pSrc->report.Basic.rader << 3); - tmp171__ |= (pSrc->report.Basic.unmeasured << 4); - tmp171__ |= (pSrc->report.Basic.unused << 5); + tmp172__ = 0U; + tmp172__ |= (pSrc->report.Basic.bss << 0); + tmp172__ |= (pSrc->report.Basic.ofdm_preamble << 1); + tmp172__ |= (pSrc->report.Basic.unid_signal << 2); + tmp172__ |= (pSrc->report.Basic.rader << 3); + tmp172__ |= (pSrc->report.Basic.unmeasured << 4); + tmp172__ |= (pSrc->report.Basic.unused << 5); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp171__; + *pBuf = tmp172__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -25356,13 +25369,13 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp172__ = 0U; - tmp172__ |= (pSrc->report.Beacon.condensed_PHY << 0); - tmp172__ |= (pSrc->report.Beacon.reported_frame_type << 7); + tmp173__ = 0U; + tmp173__ |= (pSrc->report.Beacon.condensed_PHY << 0); + tmp173__ |= (pSrc->report.Beacon.reported_frame_type << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp172__; + *pBuf = tmp173__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25411,7 +25424,7 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp173__; + uint8_t tmp174__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_request(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -25426,17 +25439,17 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, *pBuf = pSrc->measurement_token; *pnConsumed += 1; pBuf += 1; - tmp173__ = 0U; - tmp173__ |= (pSrc->parallel << 0); - tmp173__ |= (pSrc->enable << 1); - tmp173__ |= (pSrc->request << 2); - tmp173__ |= (pSrc->report << 3); - tmp173__ |= (pSrc->durationMandatory << 4); - tmp173__ |= (pSrc->unused << 5); + tmp174__ = 0U; + tmp174__ |= (pSrc->parallel << 0); + tmp174__ |= (pSrc->enable << 1); + tmp174__ |= (pSrc->request << 2); + tmp174__ |= (pSrc->report << 3); + tmp174__ |= (pSrc->durationMandatory << 4); + tmp174__ |= (pSrc->unused << 5); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp173__; + *pBuf = tmp174__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25550,7 +25563,7 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp174__; + uint8_t tmp175__; nNeeded += 3; while (pSrc->present) { if (nNeeded > nBuf) @@ -25562,14 +25575,14 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->MDID, 0); *pnConsumed += 2; pBuf += 2; - tmp174__ = 0U; - tmp174__ |= (pSrc->overDSCap << 0); - tmp174__ |= (pSrc->resourceReqCap << 1); - tmp174__ |= (pSrc->reserved << 2); + tmp175__ = 0U; + tmp175__ |= (pSrc->overDSCap << 0); + tmp175__ |= (pSrc->resourceReqCap << 1); + tmp175__ |= (pSrc->reserved << 2); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp174__; + *pBuf = tmp175__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -25591,8 +25604,8 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp175__; uint8_t tmp176__; + uint8_t tmp177__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -25607,26 +25620,14 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp175__ = 0U; - tmp175__ |= (pSrc->APReachability << 0); - tmp175__ |= (pSrc->Security << 2); - tmp175__ |= (pSrc->KeyScope << 3); - tmp175__ |= (pSrc->SpecMgmtCap << 4); - tmp175__ |= (pSrc->QosCap << 5); - tmp175__ |= (pSrc->apsd << 6); - tmp175__ |= (pSrc->rrm << 7); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp175__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp176__ = 0U; - tmp176__ |= (pSrc->DelayedBA << 0); - tmp176__ |= (pSrc->ImmBA << 1); - tmp176__ |= (pSrc->MobilityDomain << 2); - tmp176__ |= (pSrc->reserved << 3); + tmp176__ |= (pSrc->APReachability << 0); + tmp176__ |= (pSrc->Security << 2); + tmp176__ |= (pSrc->KeyScope << 3); + tmp176__ |= (pSrc->SpecMgmtCap << 4); + tmp176__ |= (pSrc->QosCap << 5); + tmp176__ |= (pSrc->apsd << 6); + tmp176__ |= (pSrc->rrm << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -25634,6 +25635,18 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + tmp177__ = 0U; + tmp177__ |= (pSrc->DelayedBA << 0); + tmp177__ |= (pSrc->ImmBA << 1); + tmp177__ |= (pSrc->MobilityDomain << 2); + tmp177__ |= (pSrc->reserved << 3); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp177__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->reserved1, 0); *pnConsumed += 2; pBuf += 2; @@ -25718,7 +25731,7 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp177__; + uint8_t tmp178__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -25727,16 +25740,16 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp177__ = 0U; - tmp177__ |= (pSrc->chanWidth << 0); - tmp177__ |= (pSrc->vht_160_80p80_supp << 2); - tmp177__ |= (pSrc->no_ldpc << 3); - tmp177__ |= (pSrc->rxNSS << 4); - tmp177__ |= (pSrc->rxNSSType << 7); + tmp178__ = 0U; + tmp178__ |= (pSrc->chanWidth << 0); + tmp178__ |= (pSrc->vht_160_80p80_supp << 2); + tmp178__ |= (pSrc->no_ldpc << 3); + tmp178__ |= (pSrc->rxNSS << 4); + tmp178__ |= (pSrc->rxNSSType << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp177__; + *pBuf = tmp178__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -26211,7 +26224,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 tmp178__; + uint8_t tmp179__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -26220,16 +26233,16 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp178__ = 0U; - tmp178__ |= (pSrc->ac_bk_traffic_aval << 0); - tmp178__ |= (pSrc->ac_be_traffic_aval << 1); - tmp178__ |= (pSrc->ac_vi_traffic_aval << 2); - tmp178__ |= (pSrc->ac_vo_traffic_aval << 3); - tmp178__ |= (pSrc->reserved << 4); + tmp179__ = 0U; + tmp179__ |= (pSrc->ac_bk_traffic_aval << 0); + tmp179__ |= (pSrc->ac_be_traffic_aval << 1); + tmp179__ |= (pSrc->ac_vi_traffic_aval << 2); + tmp179__ |= (pSrc->ac_vo_traffic_aval << 3); + tmp179__ |= (pSrc->reserved << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp178__; + *pBuf = tmp179__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -26385,7 +26398,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 tmp179__; + uint8_t tmp180__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -26394,16 +26407,16 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp179__ = 0U; - tmp179__ |= (pSrc->count << 0); - tmp179__ |= (pSrc->qack << 4); - tmp179__ |= (pSrc->qreq << 5); - tmp179__ |= (pSrc->txopreq << 6); - tmp179__ |= (pSrc->reserved << 7); + tmp180__ = 0U; + tmp180__ |= (pSrc->count << 0); + tmp180__ |= (pSrc->qack << 4); + tmp180__ |= (pSrc->qreq << 5); + tmp180__ |= (pSrc->txopreq << 6); + tmp180__ |= (pSrc->reserved << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp179__; + *pBuf = tmp180__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -26425,7 +26438,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 tmp180__; + uint8_t tmp181__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -26434,18 +26447,18 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp180__ = 0U; - tmp180__ |= (pSrc->acvo_uapsd << 0); - tmp180__ |= (pSrc->acvi_uapsd << 1); - tmp180__ |= (pSrc->acbk_uapsd << 2); - tmp180__ |= (pSrc->acbe_uapsd << 3); - tmp180__ |= (pSrc->qack << 4); - tmp180__ |= (pSrc->max_sp_length << 5); - tmp180__ |= (pSrc->more_data_ack << 7); + tmp181__ = 0U; + tmp181__ |= (pSrc->acvo_uapsd << 0); + tmp181__ |= (pSrc->acvi_uapsd << 1); + tmp181__ |= (pSrc->acbk_uapsd << 2); + tmp181__ |= (pSrc->acbe_uapsd << 3); + tmp181__ |= (pSrc->qack << 4); + tmp181__ |= (pSrc->max_sp_length << 5); + tmp181__ |= (pSrc->more_data_ack << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp180__; + *pBuf = tmp181__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -27090,7 +27103,7 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp181__; + uint16_t tmp182__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_iewapi(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -27120,13 +27133,13 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4); *pnConsumed += 4; pBuf += 4; - tmp181__ = 0U; - tmp181__ |= (pSrc->preauth << 0); - tmp181__ |= (pSrc->reserved << 1); + tmp182__ = 0U; + tmp182__ |= (pSrc->preauth << 0); + tmp182__ |= (pSrc->reserved << 1); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp181__, 0); + frameshtons(pCtx, pBuf, tmp182__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -27266,7 +27279,7 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp182__; + uint8_t tmp183__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -27288,16 +27301,16 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp182__ = 0U; - tmp182__ |= (pSrc->reserved << 0); - tmp182__ |= (pSrc->qack << 4); - tmp182__ |= (pSrc->queue_request << 5); - tmp182__ |= (pSrc->txop_request << 6); - tmp182__ |= (pSrc->more_ack << 7); + tmp183__ = 0U; + tmp183__ |= (pSrc->reserved << 0); + tmp183__ |= (pSrc->qack << 4); + tmp183__ |= (pSrc->queue_request << 5); + tmp183__ |= (pSrc->txop_request << 6); + tmp183__ |= (pSrc->more_ack << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp182__; + *pBuf = tmp183__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -27315,57 +27328,6 @@ 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 tmp183__; - 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; - tmp183__ = 0U; - tmp183__ |= (pSrc->param_set_count << 0); - tmp183__ |= (pSrc->reserved << 4); - tmp183__ |= (pSrc->uapsd << 7); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp183__; - *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; @@ -27393,13 +27355,9 @@ uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; tmp184__ = 0U; - tmp184__ |= (pSrc->acvo_uapsd << 0); - tmp184__ |= (pSrc->acvi_uapsd << 1); - tmp184__ |= (pSrc->acbk_uapsd << 2); - tmp184__ |= (pSrc->acbe_uapsd << 3); - tmp184__ |= (pSrc->reserved1 << 4); - tmp184__ |= (pSrc->max_sp_length << 5); - tmp184__ |= (pSrc->reserved2 << 7); + tmp184__ |= (pSrc->param_set_count << 0); + tmp184__ |= (pSrc->reserved << 4); + tmp184__ |= (pSrc->uapsd << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27414,6 +27372,61 @@ uint32_t dot11f_pack_ie_wmm_info_station(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 tmp185__; + 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; + tmp185__ = 0U; + tmp185__ |= (pSrc->acvo_uapsd << 0); + tmp185__ |= (pSrc->acvi_uapsd << 1); + tmp185__ |= (pSrc->acbk_uapsd << 2); + tmp185__ |= (pSrc->acbe_uapsd << 3); + tmp185__ |= (pSrc->reserved1 << 4); + tmp185__ |= (pSrc->max_sp_length << 5); + tmp185__ |= (pSrc->reserved2 << 7); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp185__; + *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, @@ -27425,7 +27438,6 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp185__; uint8_t tmp186__; uint8_t tmp187__; uint8_t tmp188__; @@ -27433,6 +27445,7 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t tmp190__; uint8_t tmp191__; uint8_t tmp192__; + uint8_t tmp193__; nNeeded += 19; while (pSrc->present) { if (nNeeded > nBuf) @@ -27460,21 +27473,11 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved2; *pnConsumed += 1; pBuf += 1; - tmp185__ = 0U; - tmp185__ |= (pSrc->acbe_aifsn << 0); - tmp185__ |= (pSrc->acbe_acm << 4); - tmp185__ |= (pSrc->acbe_aci << 5); - tmp185__ |= (pSrc->unused1 << 7); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp185__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp186__ = 0U; - tmp186__ |= (pSrc->acbe_acwmin << 0); - tmp186__ |= (pSrc->acbe_acwmax << 4); + tmp186__ |= (pSrc->acbe_aifsn << 0); + tmp186__ |= (pSrc->acbe_acm << 4); + tmp186__ |= (pSrc->acbe_aci << 5); + tmp186__ |= (pSrc->unused1 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27482,14 +27485,9 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp187__ = 0U; - tmp187__ |= (pSrc->acbk_aifsn << 0); - tmp187__ |= (pSrc->acbk_acm << 4); - tmp187__ |= (pSrc->acbk_aci << 5); - tmp187__ |= (pSrc->unused2 << 7); + tmp187__ |= (pSrc->acbe_acwmin << 0); + tmp187__ |= (pSrc->acbe_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27497,9 +27495,14 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp188__ = 0U; - tmp188__ |= (pSrc->acbk_acwmin << 0); - tmp188__ |= (pSrc->acbk_acwmax << 4); + tmp188__ |= (pSrc->acbk_aifsn << 0); + tmp188__ |= (pSrc->acbk_acm << 4); + tmp188__ |= (pSrc->acbk_aci << 5); + tmp188__ |= (pSrc->unused2 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27507,14 +27510,9 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp189__ = 0U; - tmp189__ |= (pSrc->acvi_aifsn << 0); - tmp189__ |= (pSrc->acvi_acm << 4); - tmp189__ |= (pSrc->acvi_aci << 5); - tmp189__ |= (pSrc->unused3 << 7); + tmp189__ |= (pSrc->acbk_acwmin << 0); + tmp189__ |= (pSrc->acbk_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27522,9 +27520,14 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp190__ = 0U; - tmp190__ |= (pSrc->acvi_acwmin << 0); - tmp190__ |= (pSrc->acvi_acwmax << 4); + tmp190__ |= (pSrc->acvi_aifsn << 0); + tmp190__ |= (pSrc->acvi_acm << 4); + tmp190__ |= (pSrc->acvi_aci << 5); + tmp190__ |= (pSrc->unused3 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27532,14 +27535,9 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); - *pnConsumed += 2; - pBuf += 2; tmp191__ = 0U; - tmp191__ |= (pSrc->acvo_aifsn << 0); - tmp191__ |= (pSrc->acvo_acm << 4); - tmp191__ |= (pSrc->acvo_aci << 5); - tmp191__ |= (pSrc->unused4 << 7); + tmp191__ |= (pSrc->acvi_acwmin << 0); + tmp191__ |= (pSrc->acvi_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27547,9 +27545,14 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); + *pnConsumed += 2; + pBuf += 2; tmp192__ = 0U; - tmp192__ |= (pSrc->acvo_acwmin << 0); - tmp192__ |= (pSrc->acvo_acwmax << 4); + tmp192__ |= (pSrc->acvo_aifsn << 0); + tmp192__ |= (pSrc->acvo_acm << 4); + tmp192__ |= (pSrc->acvo_aci << 5); + tmp192__ |= (pSrc->unused4 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -27557,6 +27560,16 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + tmp193__ = 0U; + tmp193__ |= (pSrc->acvo_acwmin << 0); + tmp193__ |= (pSrc->acvo_acwmax << 4); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp193__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvo_txoplimit, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ @@ -28110,7 +28123,7 @@ uint32_t dot11f_pack_ie_addba_extn_element(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp193__; + uint8_t tmp194__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -28119,14 +28132,14 @@ uint32_t dot11f_pack_ie_addba_extn_element(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp193__ = 0U; - tmp193__ |= (pSrc->no_fragmentation << 0); - tmp193__ |= (pSrc->he_frag_operation << 1); - tmp193__ |= (pSrc->reserved << 3); + tmp194__ = 0U; + tmp194__ |= (pSrc->no_fragmentation << 0); + tmp194__ |= (pSrc->he_frag_operation << 1); + tmp194__ |= (pSrc->reserved << 3); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp193__; + *pBuf = tmp194__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -28148,7 +28161,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 tmp194__; + uint8_t tmp195__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -28162,13 +28175,13 @@ uint32_t dot11f_pack_ie_bss_color_change(tpAniSirGlobal pCtx, *pBuf = pSrc->countdown; *pnConsumed += 1; pBuf += 1; - tmp194__ = 0U; - tmp194__ |= (pSrc->new_color << 0); - tmp194__ |= (pSrc->reserved << 6); + tmp195__ = 0U; + tmp195__ |= (pSrc->new_color << 0); + tmp195__ |= (pSrc->reserved << 6); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp194__; + *pBuf = tmp195__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -28190,7 +28203,7 @@ uint32_t dot11f_pack_ie_bss_max_idle_period(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp195__; + uint8_t tmp196__; nNeeded += 3; while (pSrc->present) { if (nNeeded > nBuf) @@ -28202,13 +28215,13 @@ uint32_t dot11f_pack_ie_bss_max_idle_period(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->max_idle_period, 0); *pnConsumed += 2; pBuf += 2; - tmp195__ = 0U; - tmp195__ |= (pSrc->prot_keep_alive_reqd << 0); - tmp195__ |= (pSrc->reserved << 1); + tmp196__ = 0U; + tmp196__ |= (pSrc->prot_keep_alive_reqd << 0); + tmp196__ |= (pSrc->reserved << 1); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp195__; + *pBuf = tmp196__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -28311,13 +28324,14 @@ uint32_t dot11f_pack_ie_eht_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp196__; - uint32_t tmp197__; + uint16_t tmp197__; uint32_t tmp198__; uint32_t tmp199__; - uint32_t tmp200__; + uint8_t tmp200__; uint32_t tmp201__; - uint8_t tmp202__; + uint32_t tmp202__; + uint32_t tmp203__; + uint8_t tmp204__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_eht_cap(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -28331,72 +28345,43 @@ uint32_t dot11f_pack_ie_eht_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 108; ++pBuf; ++(*pnConsumed); - tmp196__ = 0U; - tmp196__ |= (pSrc->nsep_pri_access << 0); - tmp196__ |= (pSrc->eht_om_ctl << 1); - tmp196__ |= (pSrc->triggered_txop_sharing_mode1 << 2); - tmp196__ |= (pSrc->triggered_txop_sharing_mode2 << 3); - tmp196__ |= (pSrc->restricted_twt << 4); - tmp196__ |= (pSrc->scs_traffic_desc << 5); - tmp196__ |= (pSrc->max_mpdu_len << 6); - tmp196__ |= (pSrc->reserved << 8); + tmp197__ = 0U; + tmp197__ |= (pSrc->epcs_pri_access << 0); + tmp197__ |= (pSrc->eht_om_ctl << 1); + tmp197__ |= (pSrc->triggered_txop_sharing_mode1 << 2); + tmp197__ |= (pSrc->triggered_txop_sharing_mode2 << 3); + tmp197__ |= (pSrc->restricted_twt << 4); + tmp197__ |= (pSrc->scs_traffic_desc << 5); + tmp197__ |= (pSrc->max_mpdu_len << 6); + tmp197__ |= (pSrc->reserved << 8); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp196__, 0); + frameshtons(pCtx, pBuf, tmp197__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp197__ = 0U; - tmp197__ |= (pSrc->reserved2 << 0); - tmp197__ |= (pSrc->support_320mhz_6ghz << 1); - tmp197__ |= (pSrc->ru_242tone_wt_20mhz << 2); - tmp197__ |= (pSrc->ndp_4x_eht_ltf_3dot2_us_gi << 3); - tmp197__ |= (pSrc->partial_bw_mu_mimo << 4); - tmp197__ |= (pSrc->su_beamformer << 5); - tmp197__ |= (pSrc->su_beamformee << 6); - tmp197__ |= (pSrc->bfee_ss_le_80mhz << 7); - tmp197__ |= (pSrc->bfee_ss_160mhz << 10); - tmp197__ |= (pSrc->bfee_ss_320mhz << 13); - tmp197__ |= (pSrc->num_sounding_dim_le_80mhz << 16); - tmp197__ |= (pSrc->num_sounding_dim_160mhz << 19); - tmp197__ |= (pSrc->num_sounding_dim_320mhz << 22); - tmp197__ |= (pSrc->ng_16_su_feedback << 25); - tmp197__ |= (pSrc->ng_16_mu_feedback << 26); - tmp197__ |= (pSrc->cb_sz_4_2_su_feedback << 27); - tmp197__ |= (pSrc->cb_sz_7_5_su_feedback << 28); - tmp197__ |= (pSrc->trig_su_bforming_feedback << 29); - tmp197__ |= (pSrc->trig_mu_bforming_partial_bw_feedback << 30); - tmp197__ |= (pSrc->triggered_cqi_feedback << 31); - if (unlikely(nBuf < 4)) - return DOT11F_INCOMPLETE_IE; - - frameshtonl(pCtx, pBuf, tmp197__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; tmp198__ = 0U; - tmp198__ |= (pSrc->partial_bw_dl_mu_mimo << 0); - tmp198__ |= (pSrc->psr_based_sr << 1); - tmp198__ |= (pSrc->power_boost_factor << 2); - tmp198__ |= (pSrc->eht_mu_ppdu_4x_ltf_0_8_us_gi << 3); - tmp198__ |= (pSrc->max_nc << 4); - tmp198__ |= (pSrc->non_trig_cqi_feedback << 8); - tmp198__ |= (pSrc->tx_1024_4096_qam_lt_242_tone_ru << 9); - tmp198__ |= (pSrc->rx_1024_4096_qam_lt_242_tone_ru << 10); - tmp198__ |= (pSrc->ppet_present << 11); - tmp198__ |= (pSrc->common_nominal_pkt_padding << 12); - tmp198__ |= (pSrc->max_num_eht_ltf << 14); - tmp198__ |= (pSrc->mcs_15 << 19); - tmp198__ |= (pSrc->eht_dup_6ghz << 23); - tmp198__ |= (pSrc->op_sta_rx_ndp_wider_bw_20mhz << 24); - tmp198__ |= (pSrc->non_ofdma_ul_mu_mimo_le_80mhz << 25); - tmp198__ |= (pSrc->non_ofdma_ul_mu_mimo_160mhz << 26); - tmp198__ |= (pSrc->non_ofdma_ul_mu_mimo_320mhz << 27); - tmp198__ |= (pSrc->mu_bformer_le_80mhz << 28); - tmp198__ |= (pSrc->mu_bformer_160mhz << 29); - tmp198__ |= (pSrc->mu_bformer_320mhz << 30); - tmp198__ |= (pSrc->tb_sounding_feedback_rl << 31); + tmp198__ |= (pSrc->reserved2 << 0); + tmp198__ |= (pSrc->support_320mhz_6ghz << 1); + tmp198__ |= (pSrc->ru_242tone_wt_20mhz << 2); + tmp198__ |= (pSrc->ndp_4x_eht_ltf_3dot2_us_gi << 3); + tmp198__ |= (pSrc->partial_bw_mu_mimo << 4); + tmp198__ |= (pSrc->su_beamformer << 5); + tmp198__ |= (pSrc->su_beamformee << 6); + tmp198__ |= (pSrc->bfee_ss_le_80mhz << 7); + tmp198__ |= (pSrc->bfee_ss_160mhz << 10); + tmp198__ |= (pSrc->bfee_ss_320mhz << 13); + tmp198__ |= (pSrc->num_sounding_dim_le_80mhz << 16); + tmp198__ |= (pSrc->num_sounding_dim_160mhz << 19); + tmp198__ |= (pSrc->num_sounding_dim_320mhz << 22); + tmp198__ |= (pSrc->ng_16_su_feedback << 25); + tmp198__ |= (pSrc->ng_16_mu_feedback << 26); + tmp198__ |= (pSrc->cb_sz_4_2_su_feedback << 27); + tmp198__ |= (pSrc->cb_sz_7_5_su_feedback << 28); + tmp198__ |= (pSrc->trig_su_bforming_feedback << 29); + tmp198__ |= (pSrc->trig_mu_bforming_partial_bw_feedback << 30); + tmp198__ |= (pSrc->triggered_cqi_feedback << 31); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; @@ -28405,14 +28390,27 @@ uint32_t dot11f_pack_ie_eht_cap(tpAniSirGlobal pCtx, pBuf += 4; nBuf -= 4 ; tmp199__ = 0U; - tmp199__ |= (pSrc->bw_20_rx_max_nss_for_mcs_0_to_7 << 0); - tmp199__ |= (pSrc->bw_20_tx_max_nss_for_mcs_0_to_7 << 4); - tmp199__ |= (pSrc->bw_20_rx_max_nss_for_mcs_8_and_9 << 8); - tmp199__ |= (pSrc->bw_20_tx_max_nss_for_mcs_8_and_9 << 12); - tmp199__ |= (pSrc->bw_20_rx_max_nss_for_mcs_10_and_11 << 16); - tmp199__ |= (pSrc->bw_20_tx_max_nss_for_mcs_10_and_11 << 20); - tmp199__ |= (pSrc->bw_20_rx_max_nss_for_mcs_12_and_13 << 24); - tmp199__ |= (pSrc->bw_20_tx_max_nss_for_mcs_12_and_13 << 28); + tmp199__ |= (pSrc->partial_bw_dl_mu_mimo << 0); + tmp199__ |= (pSrc->psr_based_sr << 1); + tmp199__ |= (pSrc->power_boost_factor << 2); + tmp199__ |= (pSrc->eht_mu_ppdu_4x_ltf_0_8_us_gi << 3); + tmp199__ |= (pSrc->max_nc << 4); + tmp199__ |= (pSrc->non_trig_cqi_feedback << 8); + tmp199__ |= (pSrc->tx_1024_4096_qam_lt_242_tone_ru << 9); + tmp199__ |= (pSrc->rx_1024_4096_qam_lt_242_tone_ru << 10); + tmp199__ |= (pSrc->ppet_present << 11); + tmp199__ |= (pSrc->common_nominal_pkt_padding << 12); + tmp199__ |= (pSrc->max_num_eht_ltf << 14); + tmp199__ |= (pSrc->mcs_15 << 19); + tmp199__ |= (pSrc->eht_dup_6ghz << 23); + tmp199__ |= (pSrc->op_sta_rx_ndp_wider_bw_20mhz << 24); + tmp199__ |= (pSrc->non_ofdma_ul_mu_mimo_le_80mhz << 25); + tmp199__ |= (pSrc->non_ofdma_ul_mu_mimo_160mhz << 26); + tmp199__ |= (pSrc->non_ofdma_ul_mu_mimo_320mhz << 27); + tmp199__ |= (pSrc->mu_bformer_le_80mhz << 28); + tmp199__ |= (pSrc->mu_bformer_160mhz << 29); + tmp199__ |= (pSrc->mu_bformer_320mhz << 30); + tmp199__ |= (pSrc->tb_sounding_feedback_rl << 31); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; @@ -28421,30 +28419,25 @@ uint32_t dot11f_pack_ie_eht_cap(tpAniSirGlobal pCtx, pBuf += 4; nBuf -= 4 ; tmp200__ = 0U; - tmp200__ |= (pSrc->bw_le_80_rx_max_nss_for_mcs_0_to_9 << 0); - tmp200__ |= (pSrc->bw_le_80_tx_max_nss_for_mcs_0_to_9 << 4); - tmp200__ |= (pSrc->bw_le_80_rx_max_nss_for_mcs_10_and_11 << 8); - tmp200__ |= (pSrc->bw_le_80_tx_max_nss_for_mcs_10_and_11 << 12); - tmp200__ |= (pSrc->bw_le_80_rx_max_nss_for_mcs_12_and_13 << 16); - tmp200__ |= (pSrc->bw_le_80_tx_max_nss_for_mcs_12_and_13 << 20); - tmp200__ |= (pSrc->bw_160_rx_max_nss_for_mcs_0_to_9 << 24); - tmp200__ |= (pSrc->bw_160_tx_max_nss_for_mcs_0_to_9 << 28); - if (unlikely(nBuf < 4)) + tmp200__ |= (pSrc->rx_1k_qam_in_wider_bw_dl_ofdma << 0); + tmp200__ |= (pSrc->rx_4k_qam_in_wider_bw_dl_ofdma << 1); + tmp200__ |= (pSrc->reserved3 << 2); + if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - frameshtonl(pCtx, pBuf, tmp200__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; + *pBuf = tmp200__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; tmp201__ = 0U; - tmp201__ |= (pSrc->bw_160_rx_max_nss_for_mcs_10_and_11 << 0); - tmp201__ |= (pSrc->bw_160_tx_max_nss_for_mcs_10_and_11 << 4); - tmp201__ |= (pSrc->bw_160_rx_max_nss_for_mcs_12_and_13 << 8); - tmp201__ |= (pSrc->bw_160_tx_max_nss_for_mcs_12_and_13 << 12); - tmp201__ |= (pSrc->bw_320_rx_max_nss_for_mcs_0_to_9 << 16); - tmp201__ |= (pSrc->bw_320_tx_max_nss_for_mcs_0_to_9 << 20); - tmp201__ |= (pSrc->bw_320_rx_max_nss_for_mcs_10_and_11 << 24); - tmp201__ |= (pSrc->bw_320_tx_max_nss_for_mcs_10_and_11 << 28); + tmp201__ |= (pSrc->bw_20_rx_max_nss_for_mcs_0_to_7 << 0); + tmp201__ |= (pSrc->bw_20_tx_max_nss_for_mcs_0_to_7 << 4); + tmp201__ |= (pSrc->bw_20_rx_max_nss_for_mcs_8_and_9 << 8); + tmp201__ |= (pSrc->bw_20_tx_max_nss_for_mcs_8_and_9 << 12); + tmp201__ |= (pSrc->bw_20_rx_max_nss_for_mcs_10_and_11 << 16); + tmp201__ |= (pSrc->bw_20_tx_max_nss_for_mcs_10_and_11 << 20); + tmp201__ |= (pSrc->bw_20_rx_max_nss_for_mcs_12_and_13 << 24); + tmp201__ |= (pSrc->bw_20_tx_max_nss_for_mcs_12_and_13 << 28); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; @@ -28453,12 +28446,44 @@ uint32_t dot11f_pack_ie_eht_cap(tpAniSirGlobal pCtx, pBuf += 4; nBuf -= 4 ; tmp202__ = 0U; - tmp202__ |= (pSrc->bw_320_rx_max_nss_for_mcs_12_and_13 << 0); - tmp202__ |= (pSrc->bw_320_tx_max_nss_for_mcs_12_and_13 << 4); + tmp202__ |= (pSrc->bw_le_80_rx_max_nss_for_mcs_0_to_9 << 0); + tmp202__ |= (pSrc->bw_le_80_tx_max_nss_for_mcs_0_to_9 << 4); + tmp202__ |= (pSrc->bw_le_80_rx_max_nss_for_mcs_10_and_11 << 8); + tmp202__ |= (pSrc->bw_le_80_tx_max_nss_for_mcs_10_and_11 << 12); + tmp202__ |= (pSrc->bw_le_80_rx_max_nss_for_mcs_12_and_13 << 16); + tmp202__ |= (pSrc->bw_le_80_tx_max_nss_for_mcs_12_and_13 << 20); + tmp202__ |= (pSrc->bw_160_rx_max_nss_for_mcs_0_to_9 << 24); + tmp202__ |= (pSrc->bw_160_tx_max_nss_for_mcs_0_to_9 << 28); + if (unlikely(nBuf < 4)) + return DOT11F_INCOMPLETE_IE; + + frameshtonl(pCtx, pBuf, tmp202__, 0); + *pnConsumed += 4; + pBuf += 4; + nBuf -= 4 ; + tmp203__ = 0U; + tmp203__ |= (pSrc->bw_160_rx_max_nss_for_mcs_10_and_11 << 0); + tmp203__ |= (pSrc->bw_160_tx_max_nss_for_mcs_10_and_11 << 4); + tmp203__ |= (pSrc->bw_160_rx_max_nss_for_mcs_12_and_13 << 8); + tmp203__ |= (pSrc->bw_160_tx_max_nss_for_mcs_12_and_13 << 12); + tmp203__ |= (pSrc->bw_320_rx_max_nss_for_mcs_0_to_9 << 16); + tmp203__ |= (pSrc->bw_320_tx_max_nss_for_mcs_0_to_9 << 20); + tmp203__ |= (pSrc->bw_320_rx_max_nss_for_mcs_10_and_11 << 24); + tmp203__ |= (pSrc->bw_320_tx_max_nss_for_mcs_10_and_11 << 28); + if (unlikely(nBuf < 4)) + return DOT11F_INCOMPLETE_IE; + + frameshtonl(pCtx, pBuf, tmp203__, 0); + *pnConsumed += 4; + pBuf += 4; + nBuf -= 4 ; + tmp204__ = 0U; + tmp204__ |= (pSrc->bw_320_rx_max_nss_for_mcs_12_and_13 << 0); + tmp204__ |= (pSrc->bw_320_tx_max_nss_for_mcs_12_and_13 << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp202__; + *pBuf = tmp204__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -28491,8 +28516,8 @@ uint32_t dot11f_pack_ie_eht_op(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp203__; - uint8_t tmp204__; + uint8_t tmp205__; + uint8_t tmp206__; nNeeded += (pSrc->disable_sub_chan_bitmap_present * 2 + 4); while (pSrc->present) { if (nNeeded > nBuf) @@ -28503,26 +28528,26 @@ uint32_t dot11f_pack_ie_eht_op(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 106; ++pBuf; ++(*pnConsumed); - tmp203__ = 0U; - tmp203__ |= (pSrc->width << 0); - tmp203__ |= (pSrc->reserved << 3); + tmp205__ = 0U; + tmp205__ |= (pSrc->width << 0); + tmp205__ |= (pSrc->reserved << 3); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp203__; + *pBuf = tmp205__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->ccfs, 0); *pnConsumed += 2; pBuf += 2; - tmp204__ = 0U; - tmp204__ |= (pSrc->disable_sub_chan_bitmap_present << 0); - tmp204__ |= (pSrc->reserved2 << 1); + tmp206__ = 0U; + tmp206__ |= (pSrc->disable_sub_chan_bitmap_present << 0); + tmp206__ |= (pSrc->reserved2 << 1); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp204__; + *pBuf = tmp206__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -28684,7 +28709,7 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp205__; + uint16_t tmp207__; nNeeded += (pSrc->num_variable_data + 2); while (pSrc->present) { if (nNeeded > nBuf) @@ -28693,20 +28718,20 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp205__ = 0U; - tmp205__ |= (pSrc->public_key_identifiers_cnt << 0); - tmp205__ |= (pSrc->realm_identifiers_cnt << 3); - tmp205__ |= (pSrc->is_ip_config_supported << 6); - tmp205__ |= (pSrc->is_cache_id_present << 7); - tmp205__ |= (pSrc->is_hessid_present << 8); - tmp205__ |= (pSrc->is_fils_sk_auth_supported << 9); - tmp205__ |= (pSrc->is_fils_sk_auth_pfs_supported << 10); - tmp205__ |= (pSrc->is_pk_auth_supported << 11); - tmp205__ |= (pSrc->reserved << 12); + tmp207__ = 0U; + tmp207__ |= (pSrc->public_key_identifiers_cnt << 0); + tmp207__ |= (pSrc->realm_identifiers_cnt << 3); + tmp207__ |= (pSrc->is_ip_config_supported << 6); + tmp207__ |= (pSrc->is_cache_id_present << 7); + tmp207__ |= (pSrc->is_hessid_present << 8); + tmp207__ |= (pSrc->is_fils_sk_auth_supported << 9); + tmp207__ |= (pSrc->is_fils_sk_auth_pfs_supported << 10); + tmp207__ |= (pSrc->is_pk_auth_supported << 11); + tmp207__ |= (pSrc->reserved << 12); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp205__, 0); + frameshtons(pCtx, pBuf, tmp207__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -28952,7 +28977,7 @@ uint32_t dot11f_pack_ie_he_6ghz_band_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp206__; + uint16_t tmp208__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -28963,19 +28988,19 @@ uint32_t dot11f_pack_ie_he_6ghz_band_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 59; ++pBuf; ++(*pnConsumed); - tmp206__ = 0U; - tmp206__ |= (pSrc->min_mpdu_start_spacing << 0); - tmp206__ |= (pSrc->max_ampdu_len_exp << 3); - tmp206__ |= (pSrc->max_mpdu_len << 6); - tmp206__ |= (pSrc->sm_pow_save << 9); - tmp206__ |= (pSrc->rd_responder << 11); - tmp206__ |= (pSrc->rx_ant_pattern_consistency << 12); - tmp206__ |= (pSrc->tx_ant_pattern_consistency << 13); - tmp206__ |= (pSrc->reserved << 14); + tmp208__ = 0U; + tmp208__ |= (pSrc->min_mpdu_start_spacing << 0); + tmp208__ |= (pSrc->max_ampdu_len_exp << 3); + tmp208__ |= (pSrc->max_mpdu_len << 6); + tmp208__ |= (pSrc->sm_pow_save << 9); + tmp208__ |= (pSrc->rd_responder << 11); + tmp208__ |= (pSrc->rx_ant_pattern_consistency << 12); + tmp208__ |= (pSrc->tx_ant_pattern_consistency << 13); + tmp208__ |= (pSrc->reserved << 14); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp206__, 0); + frameshtons(pCtx, pBuf, tmp208__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -28997,11 +29022,11 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp207__; - uint16_t tmp208__; uint32_t tmp209__; - uint32_t tmp210__; - uint16_t tmp211__; + uint16_t tmp210__; + uint32_t tmp211__; + uint32_t tmp212__; + uint16_t tmp213__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_cap(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -29015,82 +29040,30 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 35; ++pBuf; ++(*pnConsumed); - tmp207__ = 0U; - tmp207__ |= (pSrc->htc_he << 0); - tmp207__ |= (pSrc->twt_request << 1); - tmp207__ |= (pSrc->twt_responder << 2); - tmp207__ |= (pSrc->fragmentation << 3); - tmp207__ |= (pSrc->max_num_frag_msdu_amsdu_exp << 5); - tmp207__ |= (pSrc->min_frag_size << 8); - tmp207__ |= (pSrc->trigger_frm_mac_pad << 10); - tmp207__ |= (pSrc->multi_tid_aggr_rx_supp << 12); - tmp207__ |= (pSrc->he_link_adaptation << 15); - tmp207__ |= (pSrc->all_ack << 17); - tmp207__ |= (pSrc->trigd_rsp_sched << 18); - tmp207__ |= (pSrc->a_bsr << 19); - tmp207__ |= (pSrc->broadcast_twt << 20); - tmp207__ |= (pSrc->ba_32bit_bitmap << 21); - tmp207__ |= (pSrc->mu_cascade << 22); - tmp207__ |= (pSrc->ack_enabled_multitid << 23); - tmp207__ |= (pSrc->reserved << 24); - tmp207__ |= (pSrc->omi_a_ctrl << 25); - tmp207__ |= (pSrc->ofdma_ra << 26); - tmp207__ |= (pSrc->max_ampdu_len_exp_ext << 27); - tmp207__ |= (pSrc->amsdu_frag << 29); - tmp207__ |= (pSrc->flex_twt_sched << 30); - tmp207__ |= (pSrc->rx_ctrl_frame << 31); - if (unlikely(nBuf < 4)) - return DOT11F_INCOMPLETE_IE; - - frameshtonl(pCtx, pBuf, tmp207__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; - tmp208__ = 0U; - tmp208__ |= (pSrc->bsrp_ampdu_aggr << 0); - tmp208__ |= (pSrc->qtp << 1); - tmp208__ |= (pSrc->a_bqr << 2); - tmp208__ |= (pSrc->spatial_reuse_param_rspder << 3); - tmp208__ |= (pSrc->ndp_feedback_supp << 4); - tmp208__ |= (pSrc->ops_supp << 5); - tmp208__ |= (pSrc->amsdu_in_ampdu << 6); - tmp208__ |= (pSrc->multi_tid_aggr_tx_supp << 7); - tmp208__ |= (pSrc->he_sub_ch_sel_tx_supp << 10); - tmp208__ |= (pSrc->ul_2x996_tone_ru_supp << 11); - tmp208__ |= (pSrc->om_ctrl_ul_mu_data_dis_rx << 12); - tmp208__ |= (pSrc->he_dynamic_smps << 13); - tmp208__ |= (pSrc->punctured_sounding_supp << 14); - tmp208__ |= (pSrc->ht_vht_trg_frm_rx_supp << 15); - if (unlikely(nBuf < 2)) - return DOT11F_INCOMPLETE_IE; - - frameshtons(pCtx, pBuf, tmp208__, 0); - *pnConsumed += 2; - pBuf += 2; - nBuf -= 2 ; tmp209__ = 0U; - tmp209__ |= (pSrc->reserved2 << 0); - tmp209__ |= (pSrc->chan_width_0 << 1); - tmp209__ |= (pSrc->chan_width_1 << 2); - tmp209__ |= (pSrc->chan_width_2 << 3); - tmp209__ |= (pSrc->chan_width_3 << 4); - tmp209__ |= (pSrc->chan_width_4 << 5); - tmp209__ |= (pSrc->chan_width_5 << 6); - tmp209__ |= (pSrc->chan_width_6 << 7); - tmp209__ |= (pSrc->rx_pream_puncturing << 8); - tmp209__ |= (pSrc->device_class << 12); - tmp209__ |= (pSrc->ldpc_coding << 13); - tmp209__ |= (pSrc->he_1x_ltf_800_gi_ppdu << 14); - tmp209__ |= (pSrc->midamble_tx_rx_max_nsts << 15); - tmp209__ |= (pSrc->he_4x_ltf_3200_gi_ndp << 17); - tmp209__ |= (pSrc->tb_ppdu_tx_stbc_lt_80mhz << 18); - tmp209__ |= (pSrc->rx_stbc_lt_80mhz << 19); - tmp209__ |= (pSrc->doppler << 20); - tmp209__ |= (pSrc->ul_mu << 22); - tmp209__ |= (pSrc->dcm_enc_tx << 24); - tmp209__ |= (pSrc->dcm_enc_rx << 27); - tmp209__ |= (pSrc->ul_he_mu << 30); - tmp209__ |= (pSrc->su_beamformer << 31); + tmp209__ |= (pSrc->htc_he << 0); + tmp209__ |= (pSrc->twt_request << 1); + tmp209__ |= (pSrc->twt_responder << 2); + tmp209__ |= (pSrc->fragmentation << 3); + tmp209__ |= (pSrc->max_num_frag_msdu_amsdu_exp << 5); + tmp209__ |= (pSrc->min_frag_size << 8); + tmp209__ |= (pSrc->trigger_frm_mac_pad << 10); + tmp209__ |= (pSrc->multi_tid_aggr_rx_supp << 12); + tmp209__ |= (pSrc->he_link_adaptation << 15); + tmp209__ |= (pSrc->all_ack << 17); + tmp209__ |= (pSrc->trigd_rsp_sched << 18); + tmp209__ |= (pSrc->a_bsr << 19); + tmp209__ |= (pSrc->broadcast_twt << 20); + tmp209__ |= (pSrc->ba_32bit_bitmap << 21); + tmp209__ |= (pSrc->mu_cascade << 22); + tmp209__ |= (pSrc->ack_enabled_multitid << 23); + tmp209__ |= (pSrc->reserved << 24); + tmp209__ |= (pSrc->omi_a_ctrl << 25); + tmp209__ |= (pSrc->ofdma_ra << 26); + tmp209__ |= (pSrc->max_ampdu_len_exp_ext << 27); + tmp209__ |= (pSrc->amsdu_frag << 29); + tmp209__ |= (pSrc->flex_twt_sched << 30); + tmp209__ |= (pSrc->rx_ctrl_frame << 31); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; @@ -29099,52 +29072,104 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, pBuf += 4; nBuf -= 4 ; tmp210__ = 0U; - tmp210__ |= (pSrc->su_beamformee << 0); - tmp210__ |= (pSrc->mu_beamformer << 1); - tmp210__ |= (pSrc->bfee_sts_lt_80 << 2); - tmp210__ |= (pSrc->bfee_sts_gt_80 << 5); - tmp210__ |= (pSrc->num_sounding_lt_80 << 8); - tmp210__ |= (pSrc->num_sounding_gt_80 << 11); - tmp210__ |= (pSrc->su_feedback_tone16 << 14); - tmp210__ |= (pSrc->mu_feedback_tone16 << 15); - tmp210__ |= (pSrc->codebook_su << 16); - tmp210__ |= (pSrc->codebook_mu << 17); - tmp210__ |= (pSrc->beamforming_feedback << 18); - tmp210__ |= (pSrc->he_er_su_ppdu << 21); - tmp210__ |= (pSrc->dl_mu_mimo_part_bw << 22); - tmp210__ |= (pSrc->ppet_present << 23); - tmp210__ |= (pSrc->srp << 24); - tmp210__ |= (pSrc->power_boost << 25); - tmp210__ |= (pSrc->he_ltf_800_gi_4x << 26); - tmp210__ |= (pSrc->max_nc << 27); - tmp210__ |= (pSrc->tb_ppdu_tx_stbc_gt_80mhz << 30); - tmp210__ |= (pSrc->rx_stbc_gt_80mhz << 31); - if (unlikely(nBuf < 4)) - return DOT11F_INCOMPLETE_IE; - - frameshtonl(pCtx, pBuf, tmp210__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; - tmp211__ = 0U; - tmp211__ |= (pSrc->er_he_ltf_800_gi_4x << 0); - tmp211__ |= (pSrc->he_ppdu_20_in_40Mhz_2G << 1); - tmp211__ |= (pSrc->he_ppdu_20_in_160_80p80Mhz << 2); - tmp211__ |= (pSrc->he_ppdu_80_in_160_80p80Mhz << 3); - tmp211__ |= (pSrc->er_1x_he_ltf_gi << 4); - tmp211__ |= (pSrc->midamble_tx_rx_1x_he_ltf << 5); - tmp211__ |= (pSrc->dcm_max_bw << 6); - tmp211__ |= (pSrc->longer_than_16_he_sigb_ofdm_sym << 8); - tmp211__ |= (pSrc->non_trig_cqi_feedback << 9); - tmp211__ |= (pSrc->tx_1024_qam_lt_242_tone_ru << 10); - tmp211__ |= (pSrc->rx_1024_qam_lt_242_tone_ru << 11); - tmp211__ |= (pSrc->rx_full_bw_su_he_mu_compress_sigb << 12); - tmp211__ |= (pSrc->rx_full_bw_su_he_mu_non_cmpr_sigb << 13); - tmp211__ |= (pSrc->reserved3 << 14); + tmp210__ |= (pSrc->bsrp_ampdu_aggr << 0); + tmp210__ |= (pSrc->qtp << 1); + tmp210__ |= (pSrc->a_bqr << 2); + tmp210__ |= (pSrc->spatial_reuse_param_rspder << 3); + tmp210__ |= (pSrc->ndp_feedback_supp << 4); + tmp210__ |= (pSrc->ops_supp << 5); + tmp210__ |= (pSrc->amsdu_in_ampdu << 6); + tmp210__ |= (pSrc->multi_tid_aggr_tx_supp << 7); + tmp210__ |= (pSrc->he_sub_ch_sel_tx_supp << 10); + tmp210__ |= (pSrc->ul_2x996_tone_ru_supp << 11); + tmp210__ |= (pSrc->om_ctrl_ul_mu_data_dis_rx << 12); + tmp210__ |= (pSrc->he_dynamic_smps << 13); + tmp210__ |= (pSrc->punctured_sounding_supp << 14); + tmp210__ |= (pSrc->ht_vht_trg_frm_rx_supp << 15); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp211__, 0); + frameshtons(pCtx, pBuf, tmp210__, 0); + *pnConsumed += 2; + pBuf += 2; + nBuf -= 2 ; + tmp211__ = 0U; + tmp211__ |= (pSrc->reserved2 << 0); + tmp211__ |= (pSrc->chan_width_0 << 1); + tmp211__ |= (pSrc->chan_width_1 << 2); + tmp211__ |= (pSrc->chan_width_2 << 3); + tmp211__ |= (pSrc->chan_width_3 << 4); + tmp211__ |= (pSrc->chan_width_4 << 5); + tmp211__ |= (pSrc->chan_width_5 << 6); + tmp211__ |= (pSrc->chan_width_6 << 7); + tmp211__ |= (pSrc->rx_pream_puncturing << 8); + tmp211__ |= (pSrc->device_class << 12); + tmp211__ |= (pSrc->ldpc_coding << 13); + tmp211__ |= (pSrc->he_1x_ltf_800_gi_ppdu << 14); + tmp211__ |= (pSrc->midamble_tx_rx_max_nsts << 15); + tmp211__ |= (pSrc->he_4x_ltf_3200_gi_ndp << 17); + tmp211__ |= (pSrc->tb_ppdu_tx_stbc_lt_80mhz << 18); + tmp211__ |= (pSrc->rx_stbc_lt_80mhz << 19); + tmp211__ |= (pSrc->doppler << 20); + tmp211__ |= (pSrc->ul_mu << 22); + tmp211__ |= (pSrc->dcm_enc_tx << 24); + tmp211__ |= (pSrc->dcm_enc_rx << 27); + tmp211__ |= (pSrc->ul_he_mu << 30); + tmp211__ |= (pSrc->su_beamformer << 31); + if (unlikely(nBuf < 4)) + return DOT11F_INCOMPLETE_IE; + + frameshtonl(pCtx, pBuf, tmp211__, 0); + *pnConsumed += 4; + pBuf += 4; + nBuf -= 4 ; + tmp212__ = 0U; + tmp212__ |= (pSrc->su_beamformee << 0); + tmp212__ |= (pSrc->mu_beamformer << 1); + tmp212__ |= (pSrc->bfee_sts_lt_80 << 2); + tmp212__ |= (pSrc->bfee_sts_gt_80 << 5); + tmp212__ |= (pSrc->num_sounding_lt_80 << 8); + tmp212__ |= (pSrc->num_sounding_gt_80 << 11); + tmp212__ |= (pSrc->su_feedback_tone16 << 14); + tmp212__ |= (pSrc->mu_feedback_tone16 << 15); + tmp212__ |= (pSrc->codebook_su << 16); + tmp212__ |= (pSrc->codebook_mu << 17); + tmp212__ |= (pSrc->beamforming_feedback << 18); + tmp212__ |= (pSrc->he_er_su_ppdu << 21); + tmp212__ |= (pSrc->dl_mu_mimo_part_bw << 22); + tmp212__ |= (pSrc->ppet_present << 23); + tmp212__ |= (pSrc->srp << 24); + tmp212__ |= (pSrc->power_boost << 25); + tmp212__ |= (pSrc->he_ltf_800_gi_4x << 26); + tmp212__ |= (pSrc->max_nc << 27); + tmp212__ |= (pSrc->tb_ppdu_tx_stbc_gt_80mhz << 30); + tmp212__ |= (pSrc->rx_stbc_gt_80mhz << 31); + if (unlikely(nBuf < 4)) + return DOT11F_INCOMPLETE_IE; + + frameshtonl(pCtx, pBuf, tmp212__, 0); + *pnConsumed += 4; + pBuf += 4; + nBuf -= 4 ; + tmp213__ = 0U; + tmp213__ |= (pSrc->er_he_ltf_800_gi_4x << 0); + tmp213__ |= (pSrc->he_ppdu_20_in_40Mhz_2G << 1); + tmp213__ |= (pSrc->he_ppdu_20_in_160_80p80Mhz << 2); + tmp213__ |= (pSrc->he_ppdu_80_in_160_80p80Mhz << 3); + tmp213__ |= (pSrc->er_1x_he_ltf_gi << 4); + tmp213__ |= (pSrc->midamble_tx_rx_1x_he_ltf << 5); + tmp213__ |= (pSrc->dcm_max_bw << 6); + tmp213__ |= (pSrc->longer_than_16_he_sigb_ofdm_sym << 8); + tmp213__ |= (pSrc->non_trig_cqi_feedback << 9); + tmp213__ |= (pSrc->tx_1024_qam_lt_242_tone_ru << 10); + tmp213__ |= (pSrc->rx_1024_qam_lt_242_tone_ru << 11); + tmp213__ |= (pSrc->rx_full_bw_su_he_mu_compress_sigb << 12); + tmp213__ |= (pSrc->rx_full_bw_su_he_mu_non_cmpr_sigb << 13); + tmp213__ |= (pSrc->reserved3 << 14); + if (unlikely(nBuf < 2)) + return DOT11F_INCOMPLETE_IE; + + frameshtons(pCtx, pBuf, tmp213__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -29198,10 +29223,10 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp212__; - uint8_t tmp213__; - uint8_t tmp214__; + uint16_t tmp214__; uint8_t tmp215__; + uint8_t tmp216__; + uint8_t tmp217__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_op(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -29215,38 +29240,38 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 36; ++pBuf; ++(*pnConsumed); - tmp212__ = 0U; - tmp212__ |= (pSrc->default_pe << 0); - tmp212__ |= (pSrc->twt_required << 3); - tmp212__ |= (pSrc->txop_rts_threshold << 4); - tmp212__ |= (pSrc->vht_oper_present << 14); - tmp212__ |= (pSrc->co_located_bss << 15); + tmp214__ = 0U; + tmp214__ |= (pSrc->default_pe << 0); + tmp214__ |= (pSrc->twt_required << 3); + tmp214__ |= (pSrc->txop_rts_threshold << 4); + tmp214__ |= (pSrc->vht_oper_present << 14); + tmp214__ |= (pSrc->co_located_bss << 15); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp212__, 0); + frameshtons(pCtx, pBuf, tmp214__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp213__ = 0U; - tmp213__ |= (pSrc->er_su_disable << 0); - tmp213__ |= (pSrc->oper_info_6g_present << 1); - tmp213__ |= (pSrc->reserved2 << 2); + tmp215__ = 0U; + tmp215__ |= (pSrc->er_su_disable << 0); + tmp215__ |= (pSrc->oper_info_6g_present << 1); + tmp215__ |= (pSrc->reserved2 << 2); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp213__; + *pBuf = tmp215__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp214__ = 0U; - tmp214__ |= (pSrc->bss_color << 0); - tmp214__ |= (pSrc->partial_bss_col << 6); - tmp214__ |= (pSrc->bss_col_disabled << 7); + tmp216__ = 0U; + tmp216__ |= (pSrc->bss_color << 0); + tmp216__ |= (pSrc->partial_bss_col << 6); + tmp216__ |= (pSrc->bss_col_disabled << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp214__; + *pBuf = tmp216__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29283,15 +29308,15 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, *pBuf = pSrc->oper_info_6g.info.primary_ch; *pnConsumed += 1; pBuf += 1; - tmp215__ = 0U; - tmp215__ |= (pSrc->oper_info_6g.info.ch_width << 0); - tmp215__ |= (pSrc->oper_info_6g.info.dup_bcon << 2); - tmp215__ |= (pSrc->oper_info_6g.info.reg_info << 3); - tmp215__ |= (pSrc->oper_info_6g.info.reserved << 6); + tmp217__ = 0U; + tmp217__ |= (pSrc->oper_info_6g.info.ch_width << 0); + tmp217__ |= (pSrc->oper_info_6g.info.dup_bcon << 2); + tmp217__ |= (pSrc->oper_info_6g.info.reg_info << 3); + tmp217__ |= (pSrc->oper_info_6g.info.reserved << 6); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp215__; + *pBuf = tmp217__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29325,7 +29350,7 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp216__; + uint8_t tmp218__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_hs20vendor_ie(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -29345,15 +29370,15 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 0x10; ++pBuf; ++(*pnConsumed); - tmp216__ = 0U; - tmp216__ |= (pSrc->dgaf_dis << 0); - tmp216__ |= (pSrc->hs_id_present << 1); - tmp216__ |= (pSrc->reserved << 3); - tmp216__ |= (pSrc->release_num << 4); + tmp218__ = 0U; + tmp218__ |= (pSrc->dgaf_dis << 0); + tmp218__ |= (pSrc->hs_id_present << 1); + tmp218__ |= (pSrc->reserved << 3); + tmp218__ |= (pSrc->release_num << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp216__; + *pBuf = tmp218__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29391,7 +29416,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 tmp217__; + uint8_t tmp219__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -29400,17 +29425,17 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp217__ = 0U; - tmp217__ |= (pSrc->info_request << 0); - tmp217__ |= (pSrc->forty_mhz_intolerant << 1); - tmp217__ |= (pSrc->twenty_mhz_bsswidth_req << 2); - tmp217__ |= (pSrc->obss_scan_exemption_req << 3); - tmp217__ |= (pSrc->obss_scan_exemption_grant << 4); - tmp217__ |= (pSrc->unused << 5); + tmp219__ = 0U; + tmp219__ |= (pSrc->info_request << 0); + tmp219__ |= (pSrc->forty_mhz_intolerant << 1); + tmp219__ |= (pSrc->twenty_mhz_bsswidth_req << 2); + tmp219__ |= (pSrc->obss_scan_exemption_req << 3); + tmp219__ |= (pSrc->obss_scan_exemption_grant << 4); + tmp219__ |= (pSrc->unused << 5); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp217__; + *pBuf = tmp219__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -29495,12 +29520,12 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp218__; - uint8_t tmp219__; uint16_t tmp220__; - uint16_t tmp221__; - uint8_t tmp222__; + uint8_t tmp221__; + uint16_t tmp222__; uint16_t tmp223__; + uint8_t tmp224__; + uint16_t tmp225__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_mlo_ie(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -29514,20 +29539,20 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); *pBuf = 107; ++pBuf; --nBuf; ++(*pnConsumed); - tmp218__ = 0U; - tmp218__ |= (pSrc->type << 0); - tmp218__ |= (pSrc->reserved << 3); - tmp218__ |= (pSrc->mld_mac_addr_present << 4); - tmp218__ |= (pSrc->link_id_info_present << 5); - tmp218__ |= (pSrc->bss_param_change_cnt_present << 6); - tmp218__ |= (pSrc->medium_sync_delay_info_present << 7); - tmp218__ |= (pSrc->eml_capab_present << 8); - tmp218__ |= (pSrc->mld_capab_present << 9); - tmp218__ |= (pSrc->reserved_1 << 10); + tmp220__ = 0U; + tmp220__ |= (pSrc->type << 0); + tmp220__ |= (pSrc->reserved << 3); + tmp220__ |= (pSrc->mld_mac_addr_present << 4); + tmp220__ |= (pSrc->link_id_info_present << 5); + tmp220__ |= (pSrc->bss_param_change_cnt_present << 6); + tmp220__ |= (pSrc->medium_sync_delay_info_present << 7); + tmp220__ |= (pSrc->eml_capab_present << 8); + tmp220__ |= (pSrc->mld_capab_present << 9); + tmp220__ |= (pSrc->reserved_1 << 10); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp218__, 0); + frameshtons(pCtx, pBuf, tmp220__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -29543,13 +29568,13 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx, if (pSrc->link_id_info_present) { switch (pSrc->link_id_info_present) { case 1: - tmp219__ = 0U; - tmp219__ |= (pSrc->link_id_info.info.link_id << 0); - tmp219__ |= (pSrc->link_id_info.info.reserved << 4); + tmp221__ = 0U; + tmp221__ |= (pSrc->link_id_info.info.link_id << 0); + tmp221__ |= (pSrc->link_id_info.info.reserved << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp219__; + *pBuf = tmp221__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29568,14 +29593,14 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx, if (pSrc->medium_sync_delay_info_present) { switch (pSrc->medium_sync_delay_info_present) { case 1: - tmp220__ = 0U; - tmp220__ |= (pSrc->medium_sync_delay_info.info.medium_sync_duration << 0); - tmp220__ |= (pSrc->medium_sync_delay_info.info.medium_sync_ofdm_ed_thresh << 8); - tmp220__ |= (pSrc->medium_sync_delay_info.info.medium_sync_max_txop_num << 12); + tmp222__ = 0U; + tmp222__ |= (pSrc->medium_sync_delay_info.info.medium_sync_duration << 0); + tmp222__ |= (pSrc->medium_sync_delay_info.info.medium_sync_ofdm_ed_thresh << 8); + tmp222__ |= (pSrc->medium_sync_delay_info.info.medium_sync_max_txop_num << 12); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp220__, 0); + frameshtons(pCtx, pBuf, tmp222__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -29585,27 +29610,27 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx, if (pSrc->eml_capab_present) { switch (pSrc->eml_capab_present) { case 1: - tmp221__ = 0U; - tmp221__ |= (pSrc->eml_capabilities.info.emlsr_support << 0); - tmp221__ |= (pSrc->eml_capabilities.info.emlsr_delay << 1); - tmp221__ |= (pSrc->eml_capabilities.info.emlmr_support << 4); - tmp221__ |= (pSrc->eml_capabilities.info.emlmr_delay << 5); - tmp221__ |= (pSrc->eml_capabilities.info.transition_timeout << 8); - tmp221__ |= (pSrc->eml_capabilities.info.reserved << 12); + tmp223__ = 0U; + tmp223__ |= (pSrc->eml_capabilities.info.emlsr_support << 0); + tmp223__ |= (pSrc->eml_capabilities.info.emlsr_delay << 1); + tmp223__ |= (pSrc->eml_capabilities.info.emlmr_support << 4); + tmp223__ |= (pSrc->eml_capabilities.info.emlmr_delay << 5); + tmp223__ |= (pSrc->eml_capabilities.info.transition_timeout << 8); + tmp223__ |= (pSrc->eml_capabilities.info.reserved << 12); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp221__, 0); + frameshtons(pCtx, pBuf, tmp223__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp222__ = 0U; - tmp222__ |= (pSrc->eml_capabilities.info.emlmr_rx_nss << 0); - tmp222__ |= (pSrc->eml_capabilities.info.emlmr_tx_nss << 4); + tmp224__ = 0U; + tmp224__ |= (pSrc->eml_capabilities.info.emlmr_rx_nss << 0); + tmp224__ |= (pSrc->eml_capabilities.info.emlmr_tx_nss << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; - *pBuf = tmp222__; + *pBuf = tmp224__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -29615,16 +29640,16 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx, if (pSrc->mld_capab_present) { switch (pSrc->mld_capab_present) { case 1: - tmp223__ = 0U; - tmp223__ |= (pSrc->mld_capabilities.info.max_simultaneous_link_num << 0); - tmp223__ |= (pSrc->mld_capabilities.info.srs_support << 4); - tmp223__ |= (pSrc->mld_capabilities.info.tid_link_map_supported << 5); - tmp223__ |= (pSrc->mld_capabilities.info.str_freq_separation << 7); - tmp223__ |= (pSrc->mld_capabilities.info.reserved << 12); + tmp225__ = 0U; + tmp225__ |= (pSrc->mld_capabilities.info.max_simultaneous_link_num << 0); + tmp225__ |= (pSrc->mld_capabilities.info.srs_support << 4); + tmp225__ |= (pSrc->mld_capabilities.info.tid_link_map_supported << 5); + tmp225__ |= (pSrc->mld_capabilities.info.str_freq_separation << 7); + tmp225__ |= (pSrc->mld_capabilities.info.reserved << 12); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp223__, 0); + frameshtons(pCtx, pBuf, tmp225__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -29656,14 +29681,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 tmp224__; - uint8_t tmp225__; uint8_t tmp226__; uint8_t tmp227__; uint8_t tmp228__; uint8_t tmp229__; uint8_t tmp230__; uint8_t tmp231__; + uint8_t tmp232__; + uint8_t tmp233__; nNeeded += 13; while (pSrc->present) { if (nNeeded > nBuf) @@ -29677,36 +29702,11 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->qos; *pnConsumed += 1; pBuf += 1; - tmp224__ = 0U; - tmp224__ |= (pSrc->acbe_aifsn << 0); - tmp224__ |= (pSrc->acbe_acm << 4); - tmp224__ |= (pSrc->acbe_aci << 5); - tmp224__ |= (pSrc->unused1 << 7); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp224__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp225__ = 0U; - tmp225__ |= (pSrc->acbe_acwmin << 0); - tmp225__ |= (pSrc->acbe_acwmax << 4); - if (unlikely(nBuf < 1)) - return DOT11F_INCOMPLETE_IE; - - *pBuf = tmp225__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - *pBuf = pSrc->acbe_muedca_timer; - *pnConsumed += 1; - pBuf += 1; tmp226__ = 0U; - tmp226__ |= (pSrc->acbk_aifsn << 0); - tmp226__ |= (pSrc->acbk_acm << 4); - tmp226__ |= (pSrc->acbk_aci << 5); - tmp226__ |= (pSrc->unused2 << 7); + tmp226__ |= (pSrc->acbe_aifsn << 0); + tmp226__ |= (pSrc->acbe_acm << 4); + tmp226__ |= (pSrc->acbe_aci << 5); + tmp226__ |= (pSrc->unused1 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -29715,8 +29715,8 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, pBuf += 1; nBuf -= 1 ; tmp227__ = 0U; - tmp227__ |= (pSrc->acbk_acwmin << 0); - tmp227__ |= (pSrc->acbk_acwmax << 4); + tmp227__ |= (pSrc->acbe_acwmin << 0); + tmp227__ |= (pSrc->acbe_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -29724,14 +29724,14 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - *pBuf = pSrc->acbk_muedca_timer; + *pBuf = pSrc->acbe_muedca_timer; *pnConsumed += 1; pBuf += 1; tmp228__ = 0U; - tmp228__ |= (pSrc->acvi_aifsn << 0); - tmp228__ |= (pSrc->acvi_acm << 4); - tmp228__ |= (pSrc->acvi_aci << 5); - tmp228__ |= (pSrc->unused3 << 7); + tmp228__ |= (pSrc->acbk_aifsn << 0); + tmp228__ |= (pSrc->acbk_acm << 4); + tmp228__ |= (pSrc->acbk_aci << 5); + tmp228__ |= (pSrc->unused2 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -29740,8 +29740,8 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, pBuf += 1; nBuf -= 1 ; tmp229__ = 0U; - tmp229__ |= (pSrc->acvi_acwmin << 0); - tmp229__ |= (pSrc->acvi_acwmax << 4); + tmp229__ |= (pSrc->acbk_acwmin << 0); + tmp229__ |= (pSrc->acbk_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -29749,14 +29749,14 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - *pBuf = pSrc->acvi_muedca_timer; + *pBuf = pSrc->acbk_muedca_timer; *pnConsumed += 1; pBuf += 1; tmp230__ = 0U; - tmp230__ |= (pSrc->acvo_aifsn << 0); - tmp230__ |= (pSrc->acvo_acm << 4); - tmp230__ |= (pSrc->acvo_aci << 5); - tmp230__ |= (pSrc->unused4 << 7); + tmp230__ |= (pSrc->acvi_aifsn << 0); + tmp230__ |= (pSrc->acvi_acm << 4); + tmp230__ |= (pSrc->acvi_aci << 5); + tmp230__ |= (pSrc->unused3 << 7); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -29765,8 +29765,8 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, pBuf += 1; nBuf -= 1 ; tmp231__ = 0U; - tmp231__ |= (pSrc->acvo_acwmin << 0); - tmp231__ |= (pSrc->acvo_acwmax << 4); + tmp231__ |= (pSrc->acvi_acwmin << 0); + tmp231__ |= (pSrc->acvi_acwmax << 4); if (unlikely(nBuf < 1)) return DOT11F_INCOMPLETE_IE; @@ -29774,6 +29774,31 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; + *pBuf = pSrc->acvi_muedca_timer; + *pnConsumed += 1; + pBuf += 1; + tmp232__ = 0U; + tmp232__ |= (pSrc->acvo_aifsn << 0); + tmp232__ |= (pSrc->acvo_acm << 4); + tmp232__ |= (pSrc->acvo_aci << 5); + tmp232__ |= (pSrc->unused4 << 7); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp232__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp233__ = 0U; + tmp233__ |= (pSrc->acvo_acwmin << 0); + tmp233__ |= (pSrc->acvo_acwmax << 4); + if (unlikely(nBuf < 1)) + return DOT11F_INCOMPLETE_IE; + + *pBuf = tmp233__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; *pBuf = pSrc->acvo_muedca_timer; *pnConsumed += 1; /* fieldsEndFlag = 1 */ @@ -29948,10 +29973,10 @@ uint32_t dot11f_pack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp232__; - uint32_t tmp233__; - uint32_t tmp234__; + uint16_t tmp234__; uint32_t tmp235__; + uint32_t tmp236__; + uint32_t tmp237__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_reduced_neighbor_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -29963,16 +29988,16 @@ uint32_t dot11f_pack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp232__ = 0U; - tmp232__ |= (pSrc->tbtt_type << 0); - tmp232__ |= (pSrc->filtered_neighbor_ap << 2); - tmp232__ |= (pSrc->reserved << 3); - tmp232__ |= (pSrc->tbtt_info_count << 4); - tmp232__ |= (pSrc->tbtt_info_len << 8); + tmp234__ = 0U; + tmp234__ |= (pSrc->tbtt_type << 0); + tmp234__ |= (pSrc->filtered_neighbor_ap << 2); + tmp234__ |= (pSrc->reserved << 3); + tmp234__ |= (pSrc->tbtt_info_count << 4); + tmp234__ |= (pSrc->tbtt_info_len << 8); if (unlikely(nBuf < 2)) return DOT11F_INCOMPLETE_IE; - frameshtons(pCtx, pBuf, tmp232__, 0); + frameshtons(pCtx, pBuf, tmp234__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -30000,15 +30025,15 @@ uint32_t dot11f_pack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, *pBuf = pSrc->tbtt_info.tbtt_info_4.tbtt_offset; *pnConsumed += 1; pBuf += 1; - tmp233__ = 0U; - tmp233__ |= (pSrc->tbtt_info.tbtt_info_4.mld_id << 0); - tmp233__ |= (pSrc->tbtt_info.tbtt_info_4.link_id << 8); - tmp233__ |= (pSrc->tbtt_info.tbtt_info_4.bss_param_change_cnt << 12); - tmp233__ |= (pSrc->tbtt_info.tbtt_info_4.reserved << 20); + tmp235__ = 0U; + tmp235__ |= (pSrc->tbtt_info.tbtt_info_4.mld_id << 0); + tmp235__ |= (pSrc->tbtt_info.tbtt_info_4.link_id << 8); + tmp235__ |= (pSrc->tbtt_info.tbtt_info_4.bss_param_change_cnt << 12); + tmp235__ |= (pSrc->tbtt_info.tbtt_info_4.reserved << 20); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; - frameshtonl(pCtx, pBuf, tmp233__, 0); + frameshtonl(pCtx, pBuf, tmp235__, 0); *pnConsumed += 4; /* fieldsEndFlag = 1 */ nBuf -= 4 ; @@ -30072,15 +30097,15 @@ uint32_t dot11f_pack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->tbtt_info.tbtt_info_10.bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp234__ = 0U; - tmp234__ |= (pSrc->tbtt_info.tbtt_info_10.mld_id << 0); - tmp234__ |= (pSrc->tbtt_info.tbtt_info_10.link_id << 8); - tmp234__ |= (pSrc->tbtt_info.tbtt_info_10.bss_param_change_cnt << 12); - tmp234__ |= (pSrc->tbtt_info.tbtt_info_10.reserved << 20); + tmp236__ = 0U; + tmp236__ |= (pSrc->tbtt_info.tbtt_info_10.mld_id << 0); + tmp236__ |= (pSrc->tbtt_info.tbtt_info_10.link_id << 8); + tmp236__ |= (pSrc->tbtt_info.tbtt_info_10.bss_param_change_cnt << 12); + tmp236__ |= (pSrc->tbtt_info.tbtt_info_10.reserved << 20); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; - frameshtonl(pCtx, pBuf, tmp234__, 0); + frameshtonl(pCtx, pBuf, tmp236__, 0); *pnConsumed += 4; /* fieldsEndFlag = 1 */ nBuf -= 4 ; @@ -30143,15 +30168,15 @@ uint32_t dot11f_pack_ie_reduced_neighbor_report(tpAniSirGlobal pCtx, *pBuf = pSrc->tbtt_info.tbtt_info_16.psd_20mhz; *pnConsumed += 1; pBuf += 1; - tmp235__ = 0U; - tmp235__ |= (pSrc->tbtt_info.tbtt_info_16.mld_id << 0); - tmp235__ |= (pSrc->tbtt_info.tbtt_info_16.link_id << 8); - tmp235__ |= (pSrc->tbtt_info.tbtt_info_16.bss_param_change_cnt << 12); - tmp235__ |= (pSrc->tbtt_info.tbtt_info_16.reserved << 20); + tmp237__ = 0U; + tmp237__ |= (pSrc->tbtt_info.tbtt_info_16.mld_id << 0); + tmp237__ |= (pSrc->tbtt_info.tbtt_info_16.link_id << 8); + tmp237__ |= (pSrc->tbtt_info.tbtt_info_16.bss_param_change_cnt << 12); + tmp237__ |= (pSrc->tbtt_info.tbtt_info_16.reserved << 20); if (unlikely(nBuf < 4)) return DOT11F_INCOMPLETE_IE; - frameshtonl(pCtx, pBuf, tmp235__, 0); + frameshtonl(pCtx, pBuf, tmp237__, 0); *pnConsumed += 4; /* fieldsEndFlag = 1 */ nBuf -= 4 ;