diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms index 3b6fe0955469..5680d3e54dd5 100644 --- a/core/mac/src/cfg/cfgUtil/dot11f.frms +++ b/core/mac/src/cfg/cfgUtil/dot11f.frms @@ -113,6 +113,7 @@ const EID_PU_BUFFER_STATUS = 106; const EID_QOS_MAP_SET = 110; const EID_ESE_SPECIFIC = 150; const EID_ESE_CCKM_SPECIFIC = 156; +const EID_ADDBA_EXTN_ELEMENT = 159; const EID_VHT_CAPABILITIES = 191; const EID_VHT_OPERATION_ELEMENT = 192; const EID_VHT_EXT_BSS_LOAD = 193; @@ -475,6 +476,15 @@ FF ba_start_seq_ctrl(2) } } +IE addba_extn_element(EID_ADDBA_EXTN_ELEMENT) +{ + { + no_fragmentation: 1; + he_frag_operation: 2; + reserved: 5; + } +} + FF delba_param_set(2) { { @@ -4265,6 +4275,7 @@ FRAME addba_req FF addba_param_set; FF ba_timeout; FF ba_start_seq_ctrl; + OPTIE addba_extn_element; } FRAME addba_rsp @@ -4275,6 +4286,7 @@ FRAME addba_rsp FF Status; FF addba_param_set; FF ba_timeout; + OPTIE addba_extn_element; } FRAME delba_req diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index bf5d7575bd2c..98ade520a018 100644 --- a/core/mac/src/include/dot11f.h +++ b/core/mac/src/include/dot11f.h @@ -35,7 +35,7 @@ * * * This file was automatically generated by 'framesc' - * Thu Jan 25 09:35:43 2018 from the following file(s): + * Thu Jan 25 11:13:36 2018 from the following file(s): * * dot11f.frms * @@ -8097,6 +8097,47 @@ uint32_t dot11f_get_packed_ie_wsc_reassoc_res( }; /* End extern "C". */ #endif /* C++ */ +/* EID 159 (0x9f) */ +typedef struct sDot11fIEaddba_extn_element { + uint8_t present; + uint8_t no_fragmentation:1; + uint8_t he_frag_operation:2; + uint8_t reserved:5; +} tDot11fIEaddba_extn_element; + +#define DOT11F_EID_ADDBA_EXTN_ELEMENT (159) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_ADDBA_EXTN_ELEMENT_MIN_LEN (1) + +#define DOT11F_IE_ADDBA_EXTN_ELEMENT_MAX_LEN (1) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_addba_extn_element( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEaddba_extn_element*, + bool); + +uint32_t dot11f_pack_ie_addba_extn_element( + tpAniSirGlobal, + tDot11fIEaddba_extn_element *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_addba_extn_element( + tpAniSirGlobal, + tDot11fIEaddba_extn_element *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + /* EID 221 (0xdd) {OUI 0x00, 0x13, 0x74, 0x05} */ typedef struct sDot11fIEbss_color_change { uint8_t present; @@ -10876,12 +10917,13 @@ uint32_t dot11f_get_packed_wmm_del_ts_size(tpAniSirGlobal pCtx, #endif /* C++ */ typedef struct sDot11faddba_req{ - tDot11fFfCategory Category; - tDot11fFfAction Action; - tDot11fFfDialogToken DialogToken; - tDot11fFfaddba_param_set addba_param_set; - tDot11fFfba_timeout ba_timeout; - tDot11fFfba_start_seq_ctrl ba_start_seq_ctrl; + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fFfDialogToken DialogToken; + tDot11fFfaddba_param_set addba_param_set; + tDot11fFfba_timeout ba_timeout; + tDot11fFfba_start_seq_ctrl ba_start_seq_ctrl; + tDot11fIEaddba_extn_element addba_extn_element; } tDot11faddba_req; #define DOT11F_ADDBA_REQ (46) @@ -10905,12 +10947,13 @@ uint32_t dot11f_get_packed_addba_req_size(tpAniSirGlobal pCtx, #endif /* C++ */ typedef struct sDot11faddba_rsp{ - tDot11fFfCategory Category; - tDot11fFfAction Action; - tDot11fFfDialogToken DialogToken; - tDot11fFfStatus Status; - tDot11fFfaddba_param_set addba_param_set; - tDot11fFfba_timeout ba_timeout; + tDot11fFfCategory Category; + tDot11fFfAction Action; + tDot11fFfDialogToken DialogToken; + tDot11fFfStatus Status; + tDot11fFfaddba_param_set addba_param_set; + tDot11fFfba_timeout ba_timeout; + tDot11fIEaddba_extn_element addba_extn_element; } tDot11faddba_rsp; #define DOT11F_ADDBA_RSP (47) diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index 4f2e0d314875..b7079fd763ed 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1697,7 +1697,8 @@ static void lim_process_addba_req(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, if (QDF_STATUS_SUCCESS == qdf_status) { lim_send_addba_response_frame(mac_ctx, mac_hdr->sa, - addba_req->addba_param_set.tid, session); + addba_req->addba_param_set.tid, session, + addba_req->addba_extn_element.present); } else { pe_err("Failed to process addba request"); } diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 78258eff09dd..a50c6cd334ae 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -4684,6 +4684,7 @@ returnAfterError: * @peer_mac: Peer MAC address * @tid: TID for which addba response is being sent * @session: PE session entry + * @addba_extn_present: ADDBA extension present flag * * This function is called when ADDBA request is successful. ADDBA response is * setup by calling addba_response_setup API and frame is then sent out OTA. @@ -4691,7 +4692,8 @@ returnAfterError: * Return: QDF_STATUS */ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, - tSirMacAddr peer_mac, uint16_t tid, tpPESession session) + tSirMacAddr peer_mac, uint16_t tid, + tpPESession session, uint8_t addba_extn_present) { tDot11faddba_rsp frm; @@ -4706,6 +4708,7 @@ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, uint8_t peer_id, dialog_token; void *soc = cds_get_context(QDF_MODULE_ID_SOC); void *peer, *pdev; + uint8_t he_frag = 0; sme_sessionid = session->smeSessionId; @@ -4737,12 +4740,29 @@ QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, frm.addba_param_set.amsdu_supp = SIR_MAC_BA_POLICY_IMMEDIATE; frm.addba_param_set.policy = SIR_MAC_BA_AMSDU_SUPPORTED; frm.ba_timeout.timeout = batimeout; + if (addba_extn_present) { + frm.addba_extn_element.present = 1; + frm.addba_extn_element.no_fragmentation = 1; + if (lim_is_session_he_capable(session)) { + he_frag = lim_get_session_he_frag_cap(session); + if (he_frag != 0) { + frm.addba_extn_element.no_fragmentation = 0; + frm.addba_extn_element.he_frag_operation = + he_frag; + } + } + } pe_debug("Sending a ADDBA Response from %pM to %pM", session->selfMacAddr, peer_mac); pe_debug("tid: %d, dialog_token: %d, status: %d, buff_size: %d", tid, frm.DialogToken.token, frm.Status.status, frm.addba_param_set.buff_size); + pe_debug("addba_extn %d he_capable %d no_frag %d he_frag %d", + addba_extn_present, + lim_is_session_he_capable(session), + frm.addba_extn_element.no_fragmentation, + frm.addba_extn_element.he_frag_operation); status = dot11f_get_packed_addba_rsp_size(mac_ctx, &frm, &payload_size); if (DOT11F_FAILED(status)) { diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 1cf78f1fd7b3..7bb7e3023a81 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -985,8 +985,8 @@ enum { }; QDF_STATUS lim_send_addba_response_frame(tpAniSirGlobal mac_ctx, - tSirMacAddr peer_mac, uint16_t tid, tpPESession session); - + tSirMacAddr peer_mac, uint16_t tid, + tpPESession session, uint8_t addba_extn_present); /** * lim_process_join_failure_timeout() - This function is called to process * JoinFailureTimeout diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 2b02a3903714..b5c95195fb7d 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -988,6 +988,17 @@ static inline bool lim_is_session_he_capable(tpPESession session) return session->he_capable; } +/** + * lim_get_session_he_frag_cap(): Get session HE fragmentation cap + * @session: pointer to session + * + * Return: HE fragmentation value + */ +static inline uint8_t lim_get_session_he_frag_cap(tpPESession session) +{ + return session->he_config.fragmentation; +} + static inline bool lim_is_sta_he_capable(tpDphHashNode sta_ds) { return sta_ds->mlmStaContext.he_capable; @@ -1150,6 +1161,11 @@ static inline bool lim_is_session_he_capable(tpPESession session) return false; } +static inline uint8_t lim_get_session_he_frag_cap(tpPESession session) +{ + return 0; +} + static inline bool lim_is_sta_he_capable(tpDphHashNode sta_ds) { return false; 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 6872a579e1da..3bbc3551b8dd 100644 --- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c +++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c @@ -33,7 +33,7 @@ * * * This file was automatically generated by 'framesc' - * Thu Jan 25 09:35:43 2018 from the following file(s): + * Fri Jan 26 11:15:52 2018 from the following file(s): * * dot11f.frms * @@ -6193,11 +6193,11 @@ uint32_t dot11f_unpack_ie_wsc_reassoc_res(tpAniSirGlobal pCtx, #define SigIeWscReassocRes (0x007b) -uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIEbss_color_change *pDst, - bool append_ie) +uint32_t dot11f_unpack_ie_addba_extn_element(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEaddba_extn_element *pDst, + bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; uint8_t tmp73__; @@ -6205,17 +6205,40 @@ uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; + tmp73__ = *pBuf; + pDst->no_fragmentation = tmp73__ >> 0 & 0x1; + pDst->he_frag_operation = tmp73__ >> 1 & 0x3; + pDst->reserved = tmp73__ >> 3 & 0x1f; + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_addba_extn_element. */ + +#define SigIeaddba_extn_element (0x007c) + + +uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEbss_color_change *pDst, + bool append_ie) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp74__; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; pDst->countdown = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp73__ = *pBuf; - pDst->new_color = tmp73__ >> 0 & 0x3f; - pDst->reserved = tmp73__ >> 6 & 0x3; + tmp74__ = *pBuf; + pDst->new_color = tmp74__ >> 0 & 0x3f; + pDst->reserved = tmp74__ >> 6 & 0x3; (void)pCtx; return status; } /* End dot11f_unpack_ie_bss_color_change. */ -#define SigIebss_color_change (0x007c) +#define SigIebss_color_change (0x007d) uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx, @@ -6238,7 +6261,7 @@ uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_dh_parameter_element. */ -#define SigIedh_parameter_element (0x007d) +#define SigIedh_parameter_element (0x007e) uint32_t dot11f_unpack_ie_esp_information(tpAniSirGlobal pCtx, @@ -6263,7 +6286,7 @@ uint32_t dot11f_unpack_ie_esp_information(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_esp_information. */ -#define SigIeesp_information (0x007e) +#define SigIeesp_information (0x007f) uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, @@ -6291,7 +6314,7 @@ uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ext_chan_switch_ann. */ -#define SigIeext_chan_switch_ann (0x007f) +#define SigIeext_chan_switch_ann (0x0080) uint32_t dot11f_unpack_ie_fils_assoc_delay_info(tpAniSirGlobal pCtx, @@ -6310,7 +6333,7 @@ uint32_t dot11f_unpack_ie_fils_assoc_delay_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_assoc_delay_info. */ -#define SigIefils_assoc_delay_info (0x0080) +#define SigIefils_assoc_delay_info (0x0081) uint32_t dot11f_unpack_ie_fils_hlp_container(tpAniSirGlobal pCtx, @@ -6336,7 +6359,7 @@ uint32_t dot11f_unpack_ie_fils_hlp_container(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_hlp_container. */ -#define SigIefils_hlp_container (0x0081) +#define SigIefils_hlp_container (0x0082) uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, @@ -6346,30 +6369,30 @@ uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp74__; + uint16_t tmp75__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp74__, pBuf, 0); + framesntohs(pCtx, &tmp75__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->public_key_identifiers_cnt = tmp74__ >> 0 & 0x7; - pDst->realm_identifiers_cnt = tmp74__ >> 3 & 0x7; - pDst->is_ip_config_supported = tmp74__ >> 6 & 0x1; - pDst->is_cache_id_present = tmp74__ >> 7 & 0x1; - pDst->is_hessid_present = tmp74__ >> 8 & 0x1; - pDst->is_fils_sk_auth_supported = tmp74__ >> 9 & 0x1; - pDst->is_fils_sk_auth_pfs_supported = tmp74__ >> 10 & 0x1; - pDst->is_pk_auth_supported = tmp74__ >> 11 & 0x1; - pDst->reserved = tmp74__ >> 12 & 0xf; + pDst->public_key_identifiers_cnt = tmp75__ >> 0 & 0x7; + pDst->realm_identifiers_cnt = tmp75__ >> 3 & 0x7; + pDst->is_ip_config_supported = tmp75__ >> 6 & 0x1; + pDst->is_cache_id_present = tmp75__ >> 7 & 0x1; + pDst->is_hessid_present = tmp75__ >> 8 & 0x1; + pDst->is_fils_sk_auth_supported = tmp75__ >> 9 & 0x1; + pDst->is_fils_sk_auth_pfs_supported = tmp75__ >> 10 & 0x1; + pDst->is_pk_auth_supported = tmp75__ >> 11 & 0x1; + pDst->reserved = tmp75__ >> 12 & 0xf; pDst->num_variable_data = (uint8_t)(ielen); DOT11F_MEMCPY(pCtx, pDst->variable_data, pBuf, (ielen)); (void)pCtx; return status; } /* End dot11f_unpack_ie_fils_indication. */ -#define SigIefils_indication (0x0082) +#define SigIefils_indication (0x0083) uint32_t dot11f_unpack_ie_fils_kde(tpAniSirGlobal pCtx, @@ -6392,7 +6415,7 @@ uint32_t dot11f_unpack_ie_fils_kde(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_kde. */ -#define SigIefils_kde (0x0083) +#define SigIefils_kde (0x0084) uint32_t dot11f_unpack_ie_fils_key_confirmation(tpAniSirGlobal pCtx, @@ -6412,7 +6435,7 @@ uint32_t dot11f_unpack_ie_fils_key_confirmation(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_key_confirmation. */ -#define SigIefils_key_confirmation (0x0084) +#define SigIefils_key_confirmation (0x0085) uint32_t dot11f_unpack_ie_fils_nonce(tpAniSirGlobal pCtx, @@ -6431,7 +6454,7 @@ uint32_t dot11f_unpack_ie_fils_nonce(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_nonce. */ -#define SigIefils_nonce (0x0085) +#define SigIefils_nonce (0x0086) uint32_t dot11f_unpack_ie_fils_public_key(tpAniSirGlobal pCtx, @@ -6454,7 +6477,7 @@ uint32_t dot11f_unpack_ie_fils_public_key(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_public_key. */ -#define SigIefils_public_key (0x0086) +#define SigIefils_public_key (0x0087) uint32_t dot11f_unpack_ie_fils_session(tpAniSirGlobal pCtx, @@ -6473,7 +6496,7 @@ uint32_t dot11f_unpack_ie_fils_session(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_session. */ -#define SigIefils_session (0x0087) +#define SigIefils_session (0x0088) uint32_t dot11f_unpack_ie_fils_wrapped_data(tpAniSirGlobal pCtx, @@ -6493,7 +6516,7 @@ uint32_t dot11f_unpack_ie_fils_wrapped_data(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fils_wrapped_data. */ -#define SigIefils_wrapped_data (0x0088) +#define SigIefils_wrapped_data (0x0089) uint32_t dot11f_unpack_ie_fragment_ie(tpAniSirGlobal pCtx, @@ -6513,7 +6536,7 @@ uint32_t dot11f_unpack_ie_fragment_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fragment_ie. */ -#define SigIefragment_ie (0x0089) +#define SigIefragment_ie (0x008a) uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, @@ -6523,108 +6546,108 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint32_t tmp75__; - uint8_t tmp76__; - uint32_t tmp77__; + uint32_t tmp76__; + uint8_t tmp77__; uint32_t tmp78__; - uint8_t tmp79__; + uint32_t tmp79__; + uint8_t tmp80__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohl(pCtx, &tmp75__, pBuf, 0); + framesntohl(pCtx, &tmp76__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->htc_he = tmp75__ >> 0 & 0x1; - pDst->twt_request = tmp75__ >> 1 & 0x1; - pDst->twt_responder = tmp75__ >> 2 & 0x1; - pDst->fragmentation = tmp75__ >> 3 & 0x3; - pDst->max_num_frag_msdu = tmp75__ >> 5 & 0x7; - pDst->min_frag_size = tmp75__ >> 8 & 0x3; - pDst->trigger_frm_mac_pad = tmp75__ >> 10 & 0x3; - pDst->multi_tid_aggr = tmp75__ >> 12 & 0x7; - pDst->he_link_adaptation = tmp75__ >> 15 & 0x3; - pDst->all_ack = tmp75__ >> 17 & 0x1; - pDst->ul_mu_rsp_sched = tmp75__ >> 18 & 0x1; - pDst->a_bsr = tmp75__ >> 19 & 0x1; - pDst->broadcast_twt = tmp75__ >> 20 & 0x1; - pDst->ba_32bit_bitmap = tmp75__ >> 21 & 0x1; - pDst->mu_cascade = tmp75__ >> 22 & 0x1; - pDst->ack_enabled_multitid = tmp75__ >> 23 & 0x1; - pDst->dl_mu_ba = tmp75__ >> 24 & 0x1; - pDst->omi_a_ctrl = tmp75__ >> 25 & 0x1; - pDst->ofdma_ra = tmp75__ >> 26 & 0x1; - pDst->max_ampdu_len = tmp75__ >> 27 & 0x3; - pDst->amsdu_frag = tmp75__ >> 29 & 0x1; - pDst->flex_twt_sched = tmp75__ >> 30 & 0x1; - pDst->rx_ctrl_frame = tmp75__ >> 31 & 0x1; - tmp76__ = *pBuf; + pDst->htc_he = tmp76__ >> 0 & 0x1; + pDst->twt_request = tmp76__ >> 1 & 0x1; + pDst->twt_responder = tmp76__ >> 2 & 0x1; + pDst->fragmentation = tmp76__ >> 3 & 0x3; + pDst->max_num_frag_msdu = tmp76__ >> 5 & 0x7; + pDst->min_frag_size = tmp76__ >> 8 & 0x3; + pDst->trigger_frm_mac_pad = tmp76__ >> 10 & 0x3; + pDst->multi_tid_aggr = tmp76__ >> 12 & 0x7; + pDst->he_link_adaptation = tmp76__ >> 15 & 0x3; + pDst->all_ack = tmp76__ >> 17 & 0x1; + pDst->ul_mu_rsp_sched = tmp76__ >> 18 & 0x1; + pDst->a_bsr = tmp76__ >> 19 & 0x1; + pDst->broadcast_twt = tmp76__ >> 20 & 0x1; + pDst->ba_32bit_bitmap = tmp76__ >> 21 & 0x1; + pDst->mu_cascade = tmp76__ >> 22 & 0x1; + pDst->ack_enabled_multitid = tmp76__ >> 23 & 0x1; + pDst->dl_mu_ba = tmp76__ >> 24 & 0x1; + pDst->omi_a_ctrl = tmp76__ >> 25 & 0x1; + pDst->ofdma_ra = tmp76__ >> 26 & 0x1; + pDst->max_ampdu_len = tmp76__ >> 27 & 0x3; + pDst->amsdu_frag = tmp76__ >> 29 & 0x1; + pDst->flex_twt_sched = tmp76__ >> 30 & 0x1; + pDst->rx_ctrl_frame = tmp76__ >> 31 & 0x1; + tmp77__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->bsrp_ampdu_aggr = tmp76__ >> 0 & 0x1; - pDst->qtp = tmp76__ >> 1 & 0x1; - pDst->a_bqr = tmp76__ >> 2 & 0x1; - pDst->sr_responder = tmp76__ >> 3 & 0x1; - pDst->ndp_feedback_supp = tmp76__ >> 4 & 0x1; - pDst->ops_supp = tmp76__ >> 5 & 0x1; - pDst->amsdu_in_ampdu = tmp76__ >> 6 & 0x1; - pDst->reserved1 = tmp76__ >> 7 & 0x1; - framesntohl(pCtx, &tmp77__, pBuf, 0); - pBuf += 4; - ielen -= 4; - pDst->dual_band = tmp77__ >> 0 & 0x1; - pDst->chan_width_0 = tmp77__ >> 1 & 0x1; - pDst->chan_width_1 = tmp77__ >> 2 & 0x1; - pDst->chan_width_2 = tmp77__ >> 3 & 0x1; - pDst->chan_width_3 = tmp77__ >> 4 & 0x1; - pDst->chan_width_4 = tmp77__ >> 5 & 0x1; - pDst->chan_width_5 = tmp77__ >> 6 & 0x1; - pDst->chan_width_6 = tmp77__ >> 7 & 0x1; - pDst->rx_pream_puncturing = tmp77__ >> 8 & 0xf; - pDst->device_class = tmp77__ >> 12 & 0x1; - pDst->ldpc_coding = tmp77__ >> 13 & 0x1; - pDst->he_1x_ltf_800_gi_ppdu = tmp77__ >> 14 & 0x1; - pDst->midamble_rx_max_nsts = tmp77__ >> 15 & 0x3; - pDst->he_4x_ltf_3200_gi_ndp = tmp77__ >> 17 & 0x1; - pDst->stbc_lt_80mhz = tmp77__ >> 18 & 0x3; - pDst->doppler = tmp77__ >> 20 & 0x3; - pDst->ul_mu = tmp77__ >> 22 & 0x3; - pDst->dcm_enc_tx = tmp77__ >> 24 & 0x7; - pDst->dcm_enc_rx = tmp77__ >> 27 & 0x7; - pDst->ul_he_mu = tmp77__ >> 30 & 0x1; - pDst->su_beamformer = tmp77__ >> 31 & 0x1; + pDst->bsrp_ampdu_aggr = tmp77__ >> 0 & 0x1; + pDst->qtp = tmp77__ >> 1 & 0x1; + pDst->a_bqr = tmp77__ >> 2 & 0x1; + pDst->sr_responder = tmp77__ >> 3 & 0x1; + pDst->ndp_feedback_supp = tmp77__ >> 4 & 0x1; + pDst->ops_supp = tmp77__ >> 5 & 0x1; + pDst->amsdu_in_ampdu = tmp77__ >> 6 & 0x1; + pDst->reserved1 = tmp77__ >> 7 & 0x1; framesntohl(pCtx, &tmp78__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->su_beamformee = tmp78__ >> 0 & 0x1; - pDst->mu_beamformer = tmp78__ >> 1 & 0x1; - pDst->bfee_sts_lt_80 = tmp78__ >> 2 & 0x7; - pDst->bfee_sts_gt_80 = tmp78__ >> 5 & 0x7; - pDst->num_sounding_lt_80 = tmp78__ >> 8 & 0x7; - pDst->num_sounding_gt_80 = tmp78__ >> 11 & 0x7; - pDst->su_feedback_tone16 = tmp78__ >> 14 & 0x1; - pDst->mu_feedback_tone16 = tmp78__ >> 15 & 0x1; - pDst->codebook_su = tmp78__ >> 16 & 0x1; - pDst->codebook_mu = tmp78__ >> 17 & 0x1; - pDst->beamforming_feedback = tmp78__ >> 18 & 0x7; - pDst->he_er_su_ppdu = tmp78__ >> 21 & 0x1; - pDst->dl_mu_mimo_part_bw = tmp78__ >> 22 & 0x1; - pDst->ppet_present = tmp78__ >> 23 & 0x1; - pDst->srp = tmp78__ >> 24 & 0x1; - pDst->power_boost = tmp78__ >> 25 & 0x1; - pDst->he_ltf_800_gi_4x = tmp78__ >> 26 & 0x1; - pDst->max_nc = tmp78__ >> 27 & 0x7; - pDst->stbc_gt_80mhz = tmp78__ >> 30 & 0x3; - tmp79__ = *pBuf; + pDst->dual_band = tmp78__ >> 0 & 0x1; + pDst->chan_width_0 = tmp78__ >> 1 & 0x1; + pDst->chan_width_1 = tmp78__ >> 2 & 0x1; + pDst->chan_width_2 = tmp78__ >> 3 & 0x1; + pDst->chan_width_3 = tmp78__ >> 4 & 0x1; + pDst->chan_width_4 = tmp78__ >> 5 & 0x1; + pDst->chan_width_5 = tmp78__ >> 6 & 0x1; + pDst->chan_width_6 = tmp78__ >> 7 & 0x1; + pDst->rx_pream_puncturing = tmp78__ >> 8 & 0xf; + pDst->device_class = tmp78__ >> 12 & 0x1; + pDst->ldpc_coding = tmp78__ >> 13 & 0x1; + pDst->he_1x_ltf_800_gi_ppdu = tmp78__ >> 14 & 0x1; + pDst->midamble_rx_max_nsts = tmp78__ >> 15 & 0x3; + pDst->he_4x_ltf_3200_gi_ndp = tmp78__ >> 17 & 0x1; + pDst->stbc_lt_80mhz = tmp78__ >> 18 & 0x3; + pDst->doppler = tmp78__ >> 20 & 0x3; + pDst->ul_mu = tmp78__ >> 22 & 0x3; + pDst->dcm_enc_tx = tmp78__ >> 24 & 0x7; + pDst->dcm_enc_rx = tmp78__ >> 27 & 0x7; + pDst->ul_he_mu = tmp78__ >> 30 & 0x1; + pDst->su_beamformer = tmp78__ >> 31 & 0x1; + framesntohl(pCtx, &tmp79__, pBuf, 0); + pBuf += 4; + ielen -= 4; + pDst->su_beamformee = tmp79__ >> 0 & 0x1; + pDst->mu_beamformer = tmp79__ >> 1 & 0x1; + pDst->bfee_sts_lt_80 = tmp79__ >> 2 & 0x7; + pDst->bfee_sts_gt_80 = tmp79__ >> 5 & 0x7; + pDst->num_sounding_lt_80 = tmp79__ >> 8 & 0x7; + pDst->num_sounding_gt_80 = tmp79__ >> 11 & 0x7; + pDst->su_feedback_tone16 = tmp79__ >> 14 & 0x1; + pDst->mu_feedback_tone16 = tmp79__ >> 15 & 0x1; + pDst->codebook_su = tmp79__ >> 16 & 0x1; + pDst->codebook_mu = tmp79__ >> 17 & 0x1; + pDst->beamforming_feedback = tmp79__ >> 18 & 0x7; + pDst->he_er_su_ppdu = tmp79__ >> 21 & 0x1; + pDst->dl_mu_mimo_part_bw = tmp79__ >> 22 & 0x1; + pDst->ppet_present = tmp79__ >> 23 & 0x1; + pDst->srp = tmp79__ >> 24 & 0x1; + pDst->power_boost = tmp79__ >> 25 & 0x1; + pDst->he_ltf_800_gi_4x = tmp79__ >> 26 & 0x1; + pDst->max_nc = tmp79__ >> 27 & 0x7; + pDst->stbc_gt_80mhz = tmp79__ >> 30 & 0x3; + tmp80__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->er_he_ltf_800_gi_4x = tmp79__ >> 0 & 0x1; - pDst->he_ppdu_20_in_40Mhz_2G = tmp79__ >> 1 & 0x1; - pDst->he_ppdu_20_in_160_80p80Mhz = tmp79__ >> 2 & 0x1; - pDst->he_ppdu_80_in_160_80p80Mhz = tmp79__ >> 3 & 0x1; - pDst->er_1x_he_ltf_gi = tmp79__ >> 4 & 0x1; - pDst->midamble_rx_1x_he_ltf = tmp79__ >> 5 & 0x1; - pDst->reserved2 = tmp79__ >> 6 & 0x3; + pDst->er_he_ltf_800_gi_4x = tmp80__ >> 0 & 0x1; + pDst->he_ppdu_20_in_40Mhz_2G = tmp80__ >> 1 & 0x1; + pDst->he_ppdu_20_in_160_80p80Mhz = tmp80__ >> 2 & 0x1; + pDst->he_ppdu_80_in_160_80p80Mhz = tmp80__ >> 3 & 0x1; + pDst->er_1x_he_ltf_gi = tmp80__ >> 4 & 0x1; + pDst->midamble_rx_1x_he_ltf = tmp80__ >> 5 & 0x1; + pDst->reserved2 = tmp80__ >> 6 & 0x3; framesntohs(pCtx, &pDst->rx_he_mcs_map_lt_80, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -6680,7 +6703,7 @@ uint32_t dot11f_unpack_ie_he_cap(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_he_cap. */ -#define SigIehe_cap (0x008a) +#define SigIehe_cap (0x008b) uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, @@ -6690,25 +6713,25 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint32_t tmp80__; + uint32_t tmp81__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohl(pCtx, &tmp80__, pBuf, 0); + framesntohl(pCtx, &tmp81__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->bss_color = tmp80__ >> 0 & 0x3f; - pDst->default_pe = tmp80__ >> 6 & 0x7; - pDst->twt_required = tmp80__ >> 9 & 0x1; - pDst->rts_threshold = tmp80__ >> 10 & 0x3ff; - pDst->partial_bss_col = tmp80__ >> 20 & 0x1; - pDst->vht_oper_present = tmp80__ >> 21 & 0x1; - pDst->reserved1 = tmp80__ >> 22 & 0x3f; - pDst->mbssid_ap = tmp80__ >> 28 & 0x1; - pDst->tx_bssid_ind = tmp80__ >> 29 & 0x1; - pDst->bss_col_disabled = tmp80__ >> 30 & 0x1; - pDst->reserved2 = tmp80__ >> 31 & 0x1; + pDst->bss_color = tmp81__ >> 0 & 0x3f; + pDst->default_pe = tmp81__ >> 6 & 0x7; + pDst->twt_required = tmp81__ >> 9 & 0x1; + pDst->rts_threshold = tmp81__ >> 10 & 0x3ff; + pDst->partial_bss_col = tmp81__ >> 20 & 0x1; + pDst->vht_oper_present = tmp81__ >> 21 & 0x1; + pDst->reserved1 = tmp81__ >> 22 & 0x3f; + pDst->mbssid_ap = tmp81__ >> 28 & 0x1; + pDst->tx_bssid_ind = tmp81__ >> 29 & 0x1; + pDst->bss_col_disabled = tmp81__ >> 30 & 0x1; + pDst->reserved2 = tmp81__ >> 31 & 0x1; DOT11F_MEMCPY(pCtx, pDst->basic_mcs_nss, pBuf, 2); pBuf += 2; ielen -= (uint8_t)2; @@ -6736,7 +6759,7 @@ uint32_t dot11f_unpack_ie_he_op(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_he_op. */ -#define SigIehe_op (0x008b) +#define SigIehe_op (0x008c) uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, @@ -6746,18 +6769,18 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp81__; + uint8_t tmp82__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp81__ = *pBuf; + tmp82__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->dgaf_dis = tmp81__ >> 0 & 0x1; - pDst->hs_id_present = tmp81__ >> 1 & 0x3; - pDst->reserved = tmp81__ >> 3 & 0x1; - pDst->release_num = tmp81__ >> 4 & 0xf; + pDst->dgaf_dis = tmp82__ >> 0 & 0x1; + pDst->hs_id_present = tmp82__ >> 1 & 0x3; + pDst->reserved = tmp82__ >> 3 & 0x1; + pDst->release_num = tmp82__ >> 4 & 0xf; if (!ielen) { return 0U; } else { @@ -6778,7 +6801,7 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_hs20vendor_ie. */ -#define SigIehs20vendor_ie (0x008c) +#define SigIehs20vendor_ie (0x008d) uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, @@ -6788,23 +6811,23 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp82__; + uint8_t tmp83__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp82__ = *pBuf; - pDst->info_request = tmp82__ >> 0 & 0x1; - pDst->forty_mhz_intolerant = tmp82__ >> 1 & 0x1; - pDst->twenty_mhz_bsswidth_req = tmp82__ >> 2 & 0x1; - pDst->obss_scan_exemption_req = tmp82__ >> 3 & 0x1; - pDst->obss_scan_exemption_grant = tmp82__ >> 4 & 0x1; - pDst->unused = tmp82__ >> 5 & 0x7; + tmp83__ = *pBuf; + pDst->info_request = tmp83__ >> 0 & 0x1; + pDst->forty_mhz_intolerant = tmp83__ >> 1 & 0x1; + pDst->twenty_mhz_bsswidth_req = tmp83__ >> 2 & 0x1; + pDst->obss_scan_exemption_req = tmp83__ >> 3 & 0x1; + pDst->obss_scan_exemption_grant = tmp83__ >> 4 & 0x1; + pDst->unused = tmp83__ >> 5 & 0x7; (void)pCtx; return status; } /* End dot11f_unpack_ie_ht2040_bss_coexistence. */ -#define SigIeht2040_bss_coexistence (0x008d) +#define SigIeht2040_bss_coexistence (0x008e) uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, @@ -6832,7 +6855,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht2040_bss_intolerant_report. */ -#define SigIeht2040_bss_intolerant_report (0x008e) +#define SigIeht2040_bss_intolerant_report (0x008f) uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, @@ -6842,7 +6865,6 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, bool append_ie) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp83__; uint8_t tmp84__; uint8_t tmp85__; uint8_t tmp86__; @@ -6850,6 +6872,7 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp88__; uint8_t tmp89__; uint8_t tmp90__; + uint8_t tmp91__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -6857,69 +6880,69 @@ uint32_t dot11f_unpack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, pDst->qos = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp83__ = *pBuf; - pBuf += 1; - ielen -= 1; - pDst->acbe_aifsn = tmp83__ >> 0 & 0xf; - pDst->acbe_acm = tmp83__ >> 4 & 0x1; - pDst->acbe_aci = tmp83__ >> 5 & 0x3; - pDst->unused1 = tmp83__ >> 7 & 0x1; tmp84__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_acwmin = tmp84__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp84__ >> 4 & 0xf; - pDst->acbe_muedca_timer = *pBuf; - pBuf += 1; - ielen -= (uint8_t)1; + pDst->acbe_aifsn = tmp84__ >> 0 & 0xf; + pDst->acbe_acm = tmp84__ >> 4 & 0x1; + pDst->acbe_aci = tmp84__ >> 5 & 0x3; + pDst->unused1 = tmp84__ >> 7 & 0x1; tmp85__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp85__ >> 0 & 0xf; - pDst->acbk_acm = tmp85__ >> 4 & 0x1; - pDst->acbk_aci = tmp85__ >> 5 & 0x3; - pDst->unused2 = tmp85__ >> 7 & 0x1; + pDst->acbe_acwmin = tmp85__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp85__ >> 4 & 0xf; + pDst->acbe_muedca_timer = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; tmp86__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp86__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp86__ >> 4 & 0xf; - pDst->acbk_muedca_timer = *pBuf; - pBuf += 1; - ielen -= (uint8_t)1; + pDst->acbk_aifsn = tmp86__ >> 0 & 0xf; + pDst->acbk_acm = tmp86__ >> 4 & 0x1; + pDst->acbk_aci = tmp86__ >> 5 & 0x3; + pDst->unused2 = tmp86__ >> 7 & 0x1; tmp87__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp87__ >> 0 & 0xf; - pDst->acvi_acm = tmp87__ >> 4 & 0x1; - pDst->acvi_aci = tmp87__ >> 5 & 0x3; - pDst->unused3 = tmp87__ >> 7 & 0x1; + pDst->acbk_acwmin = tmp87__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp87__ >> 4 & 0xf; + pDst->acbk_muedca_timer = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; tmp88__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp88__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp88__ >> 4 & 0xf; - pDst->acvi_muedca_timer = *pBuf; - pBuf += 1; - ielen -= (uint8_t)1; + pDst->acvi_aifsn = tmp88__ >> 0 & 0xf; + pDst->acvi_acm = tmp88__ >> 4 & 0x1; + pDst->acvi_aci = tmp88__ >> 5 & 0x3; + pDst->unused3 = tmp88__ >> 7 & 0x1; tmp89__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp89__ >> 0 & 0xf; - pDst->acvo_acm = tmp89__ >> 4 & 0x1; - pDst->acvo_aci = tmp89__ >> 5 & 0x3; - pDst->unused4 = tmp89__ >> 7 & 0x1; + pDst->acvi_acwmin = tmp89__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp89__ >> 4 & 0xf; + pDst->acvi_muedca_timer = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; tmp90__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp90__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp90__ >> 4 & 0xf; + pDst->acvo_aifsn = tmp90__ >> 0 & 0xf; + pDst->acvo_acm = tmp90__ >> 4 & 0x1; + pDst->acvo_aci = tmp90__ >> 5 & 0x3; + pDst->unused4 = tmp90__ >> 7 & 0x1; + tmp91__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->acvo_acwmin = tmp91__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp91__ >> 4 & 0xf; pDst->acvo_muedca_timer = *pBuf; (void)pCtx; return status; } /* End dot11f_unpack_ie_mu_edca_param_set. */ -#define SigIemu_edca_param_set (0x008f) +#define SigIemu_edca_param_set (0x0090) uint32_t dot11f_unpack_ie_osen_ie(tpAniSirGlobal pCtx, @@ -6939,7 +6962,7 @@ uint32_t dot11f_unpack_ie_osen_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_osen_ie. */ -#define SigIeosen_ie (0x0090) +#define SigIeosen_ie (0x0091) uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, @@ -6958,7 +6981,7 @@ uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_sec_chan_offset_ele. */ -#define SigIesec_chan_offset_ele (0x0091) +#define SigIesec_chan_offset_ele (0x0092) static const tFFDefn FFS_vendor_vht_ie[] = { @@ -7002,7 +7025,7 @@ uint32_t dot11f_unpack_ie_vendor_vht_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor_vht_ie. */ -#define SigIevendor_vht_ie (0x0092) +#define SigIevendor_vht_ie (0x0093) static const tFFDefn FFS_AddTSRequest[] = { @@ -10047,6 +10070,10 @@ static const tFFDefn FFS_addba_req[] = { }; static const tIEDefn IES_addba_req[] = { + { offsetof(tDot11faddba_req, addba_extn_element), + offsetof(tDot11fIEaddba_extn_element, present), 0, "addba_extn_element", + 0, 3, 3, SigIeaddba_extn_element, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_ADDBA_EXTN_ELEMENT, 0, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; uint32_t dot11f_unpack_addba_req(tpAniSirGlobal pCtx, @@ -10081,6 +10108,10 @@ static const tFFDefn FFS_addba_rsp[] = { }; static const tIEDefn IES_addba_rsp[] = { + { offsetof(tDot11faddba_rsp, addba_extn_element), + offsetof(tDot11fIEaddba_extn_element, present), 0, "addba_extn_element", + 0, 3, 3, SigIeaddba_extn_element, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_ADDBA_EXTN_ELEMENT, 0, 0, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; uint32_t dot11f_unpack_addba_rsp(tpAniSirGlobal pCtx, @@ -11801,6 +11832,16 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, countOffset), append_ie); break; + case SigIeaddba_extn_element: + status |= + dot11f_unpack_ie_addba_extn_element( + pCtx, pBufRemaining, len, + (tDot11fIEaddba_extn_element *) + (pFrm + pIe->offset + + sizeof(tDot11fIEaddba_extn_element) * + countOffset), + append_ie); + break; case SigIebss_color_change: status |= dot11f_unpack_ie_bss_color_change( @@ -14873,6 +14914,13 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i), pnNeeded); break; + case SigIeaddba_extn_element: + offset = sizeof(tDot11fIEaddba_extn_element); + byteCount = 1; + pIePresent = ((tDot11fIEaddba_extn_element *) + (pFrm + pIe->offset + offset * i))-> + present; + break; case SigIebss_color_change: offset = sizeof(tDot11fIEbss_color_change); byteCount = 2; @@ -15399,25 +15447,25 @@ void dot11f_pack_ff_capabilities(tpAniSirGlobal pCtx, tDot11fFfCapabilities *pSrc, uint8_t *pBuf) { - uint16_t tmp91__; - tmp91__ = 0U; - tmp91__ |= (pSrc->ess << 0); - tmp91__ |= (pSrc->ibss << 1); - tmp91__ |= (pSrc->cfPollable << 2); - tmp91__ |= (pSrc->cfPollReq << 3); - tmp91__ |= (pSrc->privacy << 4); - tmp91__ |= (pSrc->shortPreamble << 5); - tmp91__ |= (pSrc->pbcc << 6); - tmp91__ |= (pSrc->channelAgility << 7); - tmp91__ |= (pSrc->spectrumMgt << 8); - tmp91__ |= (pSrc->qos << 9); - tmp91__ |= (pSrc->shortSlotTime << 10); - tmp91__ |= (pSrc->apsd << 11); - tmp91__ |= (pSrc->rrm << 12); - tmp91__ |= (pSrc->dsssOfdm << 13); - tmp91__ |= (pSrc->delayedBA << 14); - tmp91__ |= (pSrc->immediateBA << 15); - frameshtons(pCtx, pBuf, tmp91__, 0); + uint16_t tmp92__; + tmp92__ = 0U; + tmp92__ |= (pSrc->ess << 0); + tmp92__ |= (pSrc->ibss << 1); + tmp92__ |= (pSrc->cfPollable << 2); + tmp92__ |= (pSrc->cfPollReq << 3); + tmp92__ |= (pSrc->privacy << 4); + tmp92__ |= (pSrc->shortPreamble << 5); + tmp92__ |= (pSrc->pbcc << 6); + tmp92__ |= (pSrc->channelAgility << 7); + tmp92__ |= (pSrc->spectrumMgt << 8); + tmp92__ |= (pSrc->qos << 9); + tmp92__ |= (pSrc->shortSlotTime << 10); + tmp92__ |= (pSrc->apsd << 11); + tmp92__ |= (pSrc->rrm << 12); + tmp92__ |= (pSrc->dsssOfdm << 13); + tmp92__ |= (pSrc->delayedBA << 14); + tmp92__ |= (pSrc->immediateBA << 15); + frameshtons(pCtx, pBuf, tmp92__, 0); (void)pCtx; } /* End dot11f_pack_ff_capabilities. */ @@ -15481,13 +15529,13 @@ void dot11f_pack_ff_operating_mode(tpAniSirGlobal pCtx, tDot11fFfOperatingMode *pSrc, uint8_t *pBuf) { - uint8_t tmp92__; - tmp92__ = 0U; - tmp92__ |= (pSrc->chanWidth << 0); - tmp92__ |= (pSrc->reserved << 2); - tmp92__ |= (pSrc->rxNSS << 4); - tmp92__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp92__; + uint8_t tmp93__; + tmp93__ = 0U; + tmp93__ |= (pSrc->chanWidth << 0); + tmp93__ |= (pSrc->reserved << 2); + tmp93__ |= (pSrc->rxNSS << 4); + tmp93__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp93__; (void)pCtx; } /* End dot11f_pack_ff_operating_mode. */ @@ -15527,12 +15575,12 @@ void dot11f_pack_ff_sm_power_mode_set(tpAniSirGlobal pCtx, tDot11fFfSMPowerModeSet *pSrc, uint8_t *pBuf) { - uint8_t tmp93__; - tmp93__ = 0U; - tmp93__ |= (pSrc->PowerSave_En << 0); - tmp93__ |= (pSrc->Mode << 1); - tmp93__ |= (pSrc->reserved << 2); - *pBuf = tmp93__; + uint8_t tmp94__; + tmp94__ = 0U; + tmp94__ |= (pSrc->PowerSave_En << 0); + tmp94__ |= (pSrc->Mode << 1); + tmp94__ |= (pSrc->reserved << 2); + *pBuf = tmp94__; (void)pCtx; } /* End dot11f_pack_ff_sm_power_mode_set. */ @@ -15572,19 +15620,19 @@ void dot11f_pack_ff_ts_info(tpAniSirGlobal pCtx, tDot11fFfTSInfo *pSrc, uint8_t *pBuf) { - uint32_t tmp94__; - tmp94__ = 0U; - tmp94__ |= (pSrc->traffic_type << 0); - tmp94__ |= (pSrc->tsid << 1); - tmp94__ |= (pSrc->direction << 5); - tmp94__ |= (pSrc->access_policy << 7); - tmp94__ |= (pSrc->aggregation << 9); - tmp94__ |= (pSrc->psb << 10); - tmp94__ |= (pSrc->user_priority << 11); - tmp94__ |= (pSrc->tsinfo_ack_pol << 14); - tmp94__ |= (pSrc->schedule << 16); - tmp94__ |= (pSrc->unused << 17); - frameshtonl(pCtx, pBuf, tmp94__, 0); + uint32_t tmp95__; + tmp95__ = 0U; + tmp95__ |= (pSrc->traffic_type << 0); + tmp95__ |= (pSrc->tsid << 1); + tmp95__ |= (pSrc->direction << 5); + tmp95__ |= (pSrc->access_policy << 7); + tmp95__ |= (pSrc->aggregation << 9); + tmp95__ |= (pSrc->psb << 10); + tmp95__ |= (pSrc->user_priority << 11); + tmp95__ |= (pSrc->tsinfo_ack_pol << 14); + tmp95__ |= (pSrc->schedule << 16); + tmp95__ |= (pSrc->unused << 17); + frameshtonl(pCtx, pBuf, tmp95__, 0); (void)pCtx; } /* End dot11f_pack_ff_ts_info. */ @@ -15640,13 +15688,13 @@ void dot11f_pack_ff_addba_param_set(tpAniSirGlobal pCtx, tDot11fFfaddba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp95__; - tmp95__ = 0U; - tmp95__ |= (pSrc->amsdu_supp << 0); - tmp95__ |= (pSrc->policy << 1); - tmp95__ |= (pSrc->tid << 2); - tmp95__ |= (pSrc->buff_size << 6); - frameshtons(pCtx, pBuf, tmp95__, 0); + uint16_t tmp96__; + tmp96__ = 0U; + tmp96__ |= (pSrc->amsdu_supp << 0); + tmp96__ |= (pSrc->policy << 1); + tmp96__ |= (pSrc->tid << 2); + tmp96__ |= (pSrc->buff_size << 6); + frameshtons(pCtx, pBuf, tmp96__, 0); (void)pCtx; } /* End dot11f_pack_ff_addba_param_set. */ @@ -15654,11 +15702,11 @@ void dot11f_pack_ff_ba_start_seq_ctrl(tpAniSirGlobal pCtx, tDot11fFfba_start_seq_ctrl *pSrc, uint8_t *pBuf) { - uint16_t tmp96__; - tmp96__ = 0U; - tmp96__ |= (pSrc->frag_number << 0); - tmp96__ |= (pSrc->ssn << 4); - frameshtons(pCtx, pBuf, tmp96__, 0); + uint16_t tmp97__; + tmp97__ = 0U; + tmp97__ |= (pSrc->frag_number << 0); + tmp97__ |= (pSrc->ssn << 4); + frameshtons(pCtx, pBuf, tmp97__, 0); (void)pCtx; } /* End dot11f_pack_ff_ba_start_seq_ctrl. */ @@ -15674,12 +15722,12 @@ void dot11f_pack_ff_delba_param_set(tpAniSirGlobal pCtx, tDot11fFfdelba_param_set *pSrc, uint8_t *pBuf) { - uint16_t tmp97__; - tmp97__ = 0U; - tmp97__ |= (pSrc->reserved << 0); - tmp97__ |= (pSrc->initiator << 11); - tmp97__ |= (pSrc->tid << 12); - frameshtons(pCtx, pBuf, tmp97__, 0); + uint16_t tmp98__; + tmp98__ = 0U; + tmp98__ |= (pSrc->reserved << 0); + tmp98__ |= (pSrc->initiator << 11); + tmp98__ |= (pSrc->tid << 12); + frameshtons(pCtx, pBuf, tmp98__, 0); (void)pCtx; } /* End dot11f_pack_ff_delba_param_set. */ @@ -15687,13 +15735,13 @@ void dot11f_pack_ff_ext_chan_switch_ann_action(tpAniSirGlobal pCtx, tDot11fFfext_chan_switch_ann_action *pSrc, uint8_t *pBuf) { - uint32_t tmp98__; - tmp98__ = 0U; - tmp98__ |= (pSrc->switch_mode << 0); - tmp98__ |= (pSrc->op_class << 8); - tmp98__ |= (pSrc->new_channel << 16); - tmp98__ |= (pSrc->switch_count << 24); - frameshtonl(pCtx, pBuf, tmp98__, 0); + uint32_t tmp99__; + tmp99__ = 0U; + tmp99__ |= (pSrc->switch_mode << 0); + tmp99__ |= (pSrc->op_class << 8); + tmp99__ |= (pSrc->new_channel << 16); + tmp99__ |= (pSrc->switch_count << 24); + frameshtonl(pCtx, pBuf, tmp99__, 0); (void)pCtx; } /* End dot11f_pack_ff_ext_chan_switch_ann_action. */ @@ -15780,7 +15828,7 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp99__; + uint8_t tmp100__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -15789,10 +15837,10 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp99__ = 0U; - tmp99__ |= (pSrc->minor << 0); - tmp99__ |= (pSrc->major << 4); - *pBuf = tmp99__; + tmp100__ = 0U; + tmp100__ |= (pSrc->minor << 0); + tmp100__ |= (pSrc->major << 4); + *pBuf = tmp100__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16749,7 +16797,7 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp100__; + uint8_t tmp101__; nNeeded += 5; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -16758,10 +16806,10 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, pBuf += 2; *pnConsumed += 2; pTlvLen = pBuf; pBuf += 2; *pnConsumed += 2; - tmp100__ = 0U; - tmp100__ |= (pSrc->minor << 0); - tmp100__ |= (pSrc->major << 4); - *pBuf = tmp100__; + tmp101__ = 0U; + tmp101__ |= (pSrc->minor << 0); + tmp101__ |= (pSrc->major << 4); + *pBuf = tmp101__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16990,7 +17038,7 @@ uint32_t dot11f_pack_tlv_oce_cap(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp101__; + uint8_t tmp102__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -16999,12 +17047,12 @@ uint32_t dot11f_pack_tlv_oce_cap(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp101__ = 0U; - tmp101__ |= (pSrc->oce_release << 0); - tmp101__ |= (pSrc->is_sta_cfon << 3); - tmp101__ |= (pSrc->non_oce_ap_present << 4); - tmp101__ |= (pSrc->reserved << 5); - *pBuf = tmp101__; + tmp102__ = 0U; + tmp102__ |= (pSrc->oce_release << 0); + tmp102__ |= (pSrc->is_sta_cfon << 3); + tmp102__ |= (pSrc->non_oce_ap_present << 4); + tmp102__ |= (pSrc->reserved << 5); + *pBuf = tmp102__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17026,7 +17074,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 tmp102__; + uint8_t tmp103__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -17035,10 +17083,10 @@ uint32_t dot11f_pack_tlv_reduced_wan_metrics(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp102__ = 0U; - tmp102__ |= (pSrc->downlink_av_cap << 0); - tmp102__ |= (pSrc->uplink_av_cap << 4); - *pBuf = tmp102__; + tmp103__ = 0U; + tmp103__ |= (pSrc->downlink_av_cap << 0); + tmp103__ |= (pSrc->uplink_av_cap << 4); + *pBuf = tmp103__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17208,7 +17256,7 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp103__; + uint16_t tmp104__; nNeeded += (pSrc->num_key + 11); while (pSrc->present) { if (nNeeded > nBuf) @@ -17217,10 +17265,10 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp103__ = 0U; - tmp103__ |= (pSrc->keyId << 0); - tmp103__ |= (pSrc->reserved << 2); - frameshtons(pCtx, pBuf, tmp103__, 0); + tmp104__ = 0U; + tmp104__ |= (pSrc->keyId << 0); + tmp104__ |= (pSrc->reserved << 2); + frameshtons(pCtx, pBuf, tmp104__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -17629,11 +17677,11 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp104__; uint8_t tmp105__; uint8_t tmp106__; uint8_t tmp107__; uint8_t tmp108__; + uint8_t tmp109__; nNeeded += 5; while (pSrc->present) { if (nNeeded > nBuf) @@ -17642,60 +17690,60 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp104__ = 0U; - tmp104__ |= (pSrc->LinkMeasurement << 0); - tmp104__ |= (pSrc->NeighborRpt << 1); - tmp104__ |= (pSrc->parallel << 2); - tmp104__ |= (pSrc->repeated << 3); - tmp104__ |= (pSrc->BeaconPassive << 4); - tmp104__ |= (pSrc->BeaconActive << 5); - tmp104__ |= (pSrc->BeaconTable << 6); - tmp104__ |= (pSrc->BeaconRepCond << 7); - *pBuf = tmp104__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp105__ = 0U; - tmp105__ |= (pSrc->FrameMeasurement << 0); - tmp105__ |= (pSrc->ChannelLoad << 1); - tmp105__ |= (pSrc->NoiseHistogram << 2); - tmp105__ |= (pSrc->statistics << 3); - tmp105__ |= (pSrc->LCIMeasurement << 4); - tmp105__ |= (pSrc->LCIAzimuth << 5); - tmp105__ |= (pSrc->TCMCapability << 6); - tmp105__ |= (pSrc->triggeredTCM << 7); + tmp105__ |= (pSrc->LinkMeasurement << 0); + tmp105__ |= (pSrc->NeighborRpt << 1); + tmp105__ |= (pSrc->parallel << 2); + tmp105__ |= (pSrc->repeated << 3); + tmp105__ |= (pSrc->BeaconPassive << 4); + tmp105__ |= (pSrc->BeaconActive << 5); + tmp105__ |= (pSrc->BeaconTable << 6); + tmp105__ |= (pSrc->BeaconRepCond << 7); *pBuf = tmp105__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp106__ = 0U; - tmp106__ |= (pSrc->APChanReport << 0); - tmp106__ |= (pSrc->RRMMIBEnabled << 1); - tmp106__ |= (pSrc->operatingChanMax << 2); - tmp106__ |= (pSrc->nonOperatinChanMax << 5); + tmp106__ |= (pSrc->FrameMeasurement << 0); + tmp106__ |= (pSrc->ChannelLoad << 1); + tmp106__ |= (pSrc->NoiseHistogram << 2); + tmp106__ |= (pSrc->statistics << 3); + tmp106__ |= (pSrc->LCIMeasurement << 4); + tmp106__ |= (pSrc->LCIAzimuth << 5); + tmp106__ |= (pSrc->TCMCapability << 6); + tmp106__ |= (pSrc->triggeredTCM << 7); *pBuf = tmp106__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp107__ = 0U; - tmp107__ |= (pSrc->MeasurementPilot << 0); - tmp107__ |= (pSrc->MeasurementPilotEnabled << 3); - tmp107__ |= (pSrc->NeighborTSFOffset << 4); - tmp107__ |= (pSrc->RCPIMeasurement << 5); - tmp107__ |= (pSrc->RSNIMeasurement << 6); - tmp107__ |= (pSrc->BssAvgAccessDelay << 7); + tmp107__ |= (pSrc->APChanReport << 0); + tmp107__ |= (pSrc->RRMMIBEnabled << 1); + tmp107__ |= (pSrc->operatingChanMax << 2); + tmp107__ |= (pSrc->nonOperatinChanMax << 5); *pBuf = tmp107__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp108__ = 0U; - tmp108__ |= (pSrc->BSSAvailAdmission << 0); - tmp108__ |= (pSrc->AntennaInformation << 1); - tmp108__ |= (pSrc->fine_time_meas_rpt << 2); - tmp108__ |= (pSrc->lci_capability << 3); - tmp108__ |= (pSrc->reserved << 4); + tmp108__ |= (pSrc->MeasurementPilot << 0); + tmp108__ |= (pSrc->MeasurementPilotEnabled << 3); + tmp108__ |= (pSrc->NeighborTSFOffset << 4); + tmp108__ |= (pSrc->RCPIMeasurement << 5); + tmp108__ |= (pSrc->RSNIMeasurement << 6); + tmp108__ |= (pSrc->BssAvgAccessDelay << 7); *pBuf = tmp108__; *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp109__ = 0U; + tmp109__ |= (pSrc->BSSAvailAdmission << 0); + tmp109__ |= (pSrc->AntennaInformation << 1); + tmp109__ |= (pSrc->fine_time_meas_rpt << 2); + tmp109__ |= (pSrc->lci_capability << 3); + tmp109__ |= (pSrc->reserved << 4); + *pBuf = tmp109__; + *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; break; @@ -17774,7 +17822,7 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp109__; + uint16_t tmp110__; nNeeded += 14; while (pSrc->present) { if (nNeeded > nBuf) @@ -17783,12 +17831,12 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp109__ = 0U; - tmp109__ |= (pSrc->aggregation << 0); - tmp109__ |= (pSrc->tsid << 1); - tmp109__ |= (pSrc->direction << 5); - tmp109__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp109__, 0); + tmp110__ = 0U; + tmp110__ |= (pSrc->aggregation << 0); + tmp110__ |= (pSrc->tsid << 1); + tmp110__ |= (pSrc->direction << 5); + tmp110__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp110__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18015,9 +18063,9 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp110__; - uint8_t tmp111__; - uint16_t tmp112__; + uint16_t tmp111__; + uint8_t tmp112__; + uint16_t tmp113__; nNeeded += 55; while (pSrc->present) { if (nNeeded > nBuf) @@ -18026,30 +18074,30 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp110__ = 0U; - tmp110__ |= (pSrc->traffic_type << 0); - tmp110__ |= (pSrc->tsid << 1); - tmp110__ |= (pSrc->direction << 5); - tmp110__ |= (pSrc->access_policy << 7); - tmp110__ |= (pSrc->aggregation << 9); - tmp110__ |= (pSrc->psb << 10); - tmp110__ |= (pSrc->user_priority << 11); - tmp110__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp110__, 0); + tmp111__ = 0U; + tmp111__ |= (pSrc->traffic_type << 0); + tmp111__ |= (pSrc->tsid << 1); + tmp111__ |= (pSrc->direction << 5); + tmp111__ |= (pSrc->access_policy << 7); + tmp111__ |= (pSrc->aggregation << 9); + tmp111__ |= (pSrc->psb << 10); + tmp111__ |= (pSrc->user_priority << 11); + tmp111__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp111__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp111__ = 0U; - tmp111__ |= (pSrc->schedule << 0); - tmp111__ |= (pSrc->unused << 1); - *pBuf = tmp111__; + tmp112__ = 0U; + tmp112__ |= (pSrc->schedule << 0); + tmp112__ |= (pSrc->unused << 1); + *pBuf = tmp112__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp112__ = 0U; - tmp112__ |= (pSrc->size << 0); - tmp112__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp112__, 0); + tmp113__ = 0U; + tmp113__ |= (pSrc->size << 0); + tmp113__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp113__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18113,9 +18161,9 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp113__; - uint16_t tmp114__; + uint32_t tmp114__; uint16_t tmp115__; + uint16_t tmp116__; nNeeded += 12; while (pSrc->present) { if (nNeeded > nBuf) @@ -18124,48 +18172,48 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp113__ = 0U; - tmp113__ |= (pSrc->maxMPDULen << 0); - tmp113__ |= (pSrc->supportedChannelWidthSet << 2); - tmp113__ |= (pSrc->ldpcCodingCap << 4); - tmp113__ |= (pSrc->shortGI80MHz << 5); - tmp113__ |= (pSrc->shortGI160and80plus80MHz << 6); - tmp113__ |= (pSrc->txSTBC << 7); - tmp113__ |= (pSrc->rxSTBC << 8); - tmp113__ |= (pSrc->suBeamFormerCap << 11); - tmp113__ |= (pSrc->suBeamformeeCap << 12); - tmp113__ |= (pSrc->csnofBeamformerAntSup << 13); - tmp113__ |= (pSrc->numSoundingDim << 16); - tmp113__ |= (pSrc->muBeamformerCap << 19); - tmp113__ |= (pSrc->muBeamformeeCap << 20); - tmp113__ |= (pSrc->vhtTXOPPS << 21); - tmp113__ |= (pSrc->htcVHTCap << 22); - tmp113__ |= (pSrc->maxAMPDULenExp << 23); - tmp113__ |= (pSrc->vhtLinkAdaptCap << 26); - tmp113__ |= (pSrc->rxAntPattern << 28); - tmp113__ |= (pSrc->txAntPattern << 29); - tmp113__ |= (pSrc->reserved1 << 30); - frameshtonl(pCtx, pBuf, tmp113__, 0); + tmp114__ = 0U; + tmp114__ |= (pSrc->maxMPDULen << 0); + tmp114__ |= (pSrc->supportedChannelWidthSet << 2); + tmp114__ |= (pSrc->ldpcCodingCap << 4); + tmp114__ |= (pSrc->shortGI80MHz << 5); + tmp114__ |= (pSrc->shortGI160and80plus80MHz << 6); + tmp114__ |= (pSrc->txSTBC << 7); + tmp114__ |= (pSrc->rxSTBC << 8); + tmp114__ |= (pSrc->suBeamFormerCap << 11); + tmp114__ |= (pSrc->suBeamformeeCap << 12); + tmp114__ |= (pSrc->csnofBeamformerAntSup << 13); + tmp114__ |= (pSrc->numSoundingDim << 16); + tmp114__ |= (pSrc->muBeamformerCap << 19); + tmp114__ |= (pSrc->muBeamformeeCap << 20); + tmp114__ |= (pSrc->vhtTXOPPS << 21); + tmp114__ |= (pSrc->htcVHTCap << 22); + tmp114__ |= (pSrc->maxAMPDULenExp << 23); + tmp114__ |= (pSrc->vhtLinkAdaptCap << 26); + tmp114__ |= (pSrc->rxAntPattern << 28); + tmp114__ |= (pSrc->txAntPattern << 29); + tmp114__ |= (pSrc->reserved1 << 30); + frameshtonl(pCtx, pBuf, tmp114__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp114__ = 0U; - tmp114__ |= (pSrc->rxHighSupDataRate << 0); - tmp114__ |= (pSrc->reserved2 << 13); - frameshtons(pCtx, pBuf, tmp114__, 0); + tmp115__ = 0U; + tmp115__ |= (pSrc->rxHighSupDataRate << 0); + tmp115__ |= (pSrc->reserved2 << 13); + frameshtons(pCtx, pBuf, tmp115__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp115__ = 0U; - tmp115__ |= (pSrc->txSupDataRate << 0); - tmp115__ |= (pSrc->reserved3 << 13); - frameshtons(pCtx, pBuf, tmp115__, 0); + tmp116__ = 0U; + tmp116__ |= (pSrc->txSupDataRate << 0); + tmp116__ |= (pSrc->reserved3 << 13); + frameshtons(pCtx, pBuf, tmp116__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -18225,7 +18273,7 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp116__; + uint16_t tmp117__; nNeeded += 15; while (pSrc->present) { if (nNeeded > nBuf) @@ -18247,12 +18295,12 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp116__ = 0U; - tmp116__ |= (pSrc->aggregation << 0); - tmp116__ |= (pSrc->tsid << 1); - tmp116__ |= (pSrc->direction << 5); - tmp116__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp116__, 0); + tmp117__ = 0U; + tmp117__ |= (pSrc->aggregation << 0); + tmp117__ |= (pSrc->tsid << 1); + tmp117__ |= (pSrc->direction << 5); + tmp117__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp117__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18486,9 +18534,9 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp117__; - uint8_t tmp118__; - uint16_t tmp119__; + uint16_t tmp118__; + uint8_t tmp119__; + uint16_t tmp120__; nNeeded += 38; while (pSrc->present) { if (nNeeded > nBuf) @@ -18510,30 +18558,30 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp117__ = 0U; - tmp117__ |= (pSrc->traffic_type << 0); - tmp117__ |= (pSrc->tsid << 1); - tmp117__ |= (pSrc->direction << 5); - tmp117__ |= (pSrc->access_policy << 7); - tmp117__ |= (pSrc->aggregation << 9); - tmp117__ |= (pSrc->psb << 10); - tmp117__ |= (pSrc->user_priority << 11); - tmp117__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp117__, 0); + tmp118__ = 0U; + tmp118__ |= (pSrc->traffic_type << 0); + tmp118__ |= (pSrc->tsid << 1); + tmp118__ |= (pSrc->direction << 5); + tmp118__ |= (pSrc->access_policy << 7); + tmp118__ |= (pSrc->aggregation << 9); + tmp118__ |= (pSrc->psb << 10); + tmp118__ |= (pSrc->user_priority << 11); + tmp118__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp118__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp118__ = 0U; - tmp118__ |= (pSrc->tsinfo_rsvd << 0); - tmp118__ |= (pSrc->burst_size_defn << 7); - *pBuf = tmp118__; + tmp119__ = 0U; + tmp119__ |= (pSrc->tsinfo_rsvd << 0); + tmp119__ |= (pSrc->burst_size_defn << 7); + *pBuf = tmp119__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp119__ = 0U; - tmp119__ |= (pSrc->size << 0); - tmp119__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp119__, 0); + tmp120__ = 0U; + tmp120__ |= (pSrc->size << 0); + tmp120__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp120__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18690,8 +18738,8 @@ uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp120__; uint8_t tmp121__; + uint8_t tmp122__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_rpt(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -18706,24 +18754,24 @@ uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp120__ = 0U; - tmp120__ |= (pSrc->APReachability << 0); - tmp120__ |= (pSrc->Security << 2); - tmp120__ |= (pSrc->KeyScope << 3); - tmp120__ |= (pSrc->SpecMgmtCap << 4); - tmp120__ |= (pSrc->QosCap << 5); - tmp120__ |= (pSrc->apsd << 6); - tmp120__ |= (pSrc->rrm << 7); - *pBuf = tmp120__; + tmp121__ = 0U; + tmp121__ |= (pSrc->APReachability << 0); + tmp121__ |= (pSrc->Security << 2); + tmp121__ |= (pSrc->KeyScope << 3); + tmp121__ |= (pSrc->SpecMgmtCap << 4); + tmp121__ |= (pSrc->QosCap << 5); + tmp121__ |= (pSrc->apsd << 6); + tmp121__ |= (pSrc->rrm << 7); + *pBuf = tmp121__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp121__ = 0U; - tmp121__ |= (pSrc->DelayedBA << 0); - tmp121__ |= (pSrc->ImmBA << 1); - tmp121__ |= (pSrc->MobilityDomain << 2); - tmp121__ |= (pSrc->reserved << 3); - *pBuf = tmp121__; + tmp122__ = 0U; + tmp122__ |= (pSrc->DelayedBA << 0); + tmp122__ |= (pSrc->ImmBA << 1); + tmp122__ |= (pSrc->MobilityDomain << 2); + tmp122__ |= (pSrc->reserved << 3); + *pBuf = tmp122__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19086,7 +19134,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 tmp122__; uint8_t tmp123__; uint8_t tmp124__; uint8_t tmp125__; @@ -19094,6 +19141,7 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t tmp127__; uint8_t tmp128__; uint8_t tmp129__; + uint8_t tmp130__; nNeeded += 18; while (pSrc->present) { if (nNeeded > nBuf) @@ -19108,76 +19156,76 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; - tmp122__ = 0U; - tmp122__ |= (pSrc->acbe_aifsn << 0); - tmp122__ |= (pSrc->acbe_acm << 4); - tmp122__ |= (pSrc->acbe_aci << 5); - tmp122__ |= (pSrc->unused1 << 7); - *pBuf = tmp122__; + tmp123__ = 0U; + tmp123__ |= (pSrc->acbe_aifsn << 0); + tmp123__ |= (pSrc->acbe_acm << 4); + tmp123__ |= (pSrc->acbe_aci << 5); + tmp123__ |= (pSrc->unused1 << 7); + *pBuf = tmp123__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp123__ = 0U; - tmp123__ |= (pSrc->acbe_acwmin << 0); - tmp123__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp123__; + tmp124__ = 0U; + tmp124__ |= (pSrc->acbe_acwmin << 0); + tmp124__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp124__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp124__ = 0U; - tmp124__ |= (pSrc->acbk_aifsn << 0); - tmp124__ |= (pSrc->acbk_acm << 4); - tmp124__ |= (pSrc->acbk_aci << 5); - tmp124__ |= (pSrc->unused2 << 7); - *pBuf = tmp124__; + tmp125__ = 0U; + tmp125__ |= (pSrc->acbk_aifsn << 0); + tmp125__ |= (pSrc->acbk_acm << 4); + tmp125__ |= (pSrc->acbk_aci << 5); + tmp125__ |= (pSrc->unused2 << 7); + *pBuf = tmp125__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp125__ = 0U; - tmp125__ |= (pSrc->acbk_acwmin << 0); - tmp125__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp125__; + tmp126__ = 0U; + tmp126__ |= (pSrc->acbk_acwmin << 0); + tmp126__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp126__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp126__ = 0U; - tmp126__ |= (pSrc->acvi_aifsn << 0); - tmp126__ |= (pSrc->acvi_acm << 4); - tmp126__ |= (pSrc->acvi_aci << 5); - tmp126__ |= (pSrc->unused3 << 7); - *pBuf = tmp126__; + tmp127__ = 0U; + tmp127__ |= (pSrc->acvi_aifsn << 0); + tmp127__ |= (pSrc->acvi_acm << 4); + tmp127__ |= (pSrc->acvi_aci << 5); + tmp127__ |= (pSrc->unused3 << 7); + *pBuf = tmp127__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp127__ = 0U; - tmp127__ |= (pSrc->acvi_acwmin << 0); - tmp127__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp127__; + tmp128__ = 0U; + tmp128__ |= (pSrc->acvi_acwmin << 0); + tmp128__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp128__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp128__ = 0U; - tmp128__ |= (pSrc->acvo_aifsn << 0); - tmp128__ |= (pSrc->acvo_acm << 4); - tmp128__ |= (pSrc->acvo_aci << 5); - tmp128__ |= (pSrc->unused4 << 7); - *pBuf = tmp128__; + tmp129__ = 0U; + tmp129__ |= (pSrc->acvo_aifsn << 0); + tmp129__ |= (pSrc->acvo_acm << 4); + tmp129__ |= (pSrc->acvo_aci << 5); + tmp129__ |= (pSrc->unused4 << 7); + *pBuf = tmp129__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp129__ = 0U; - tmp129__ |= (pSrc->acvo_acwmin << 0); - tmp129__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp129__; + tmp130__ = 0U; + tmp130__ |= (pSrc->acvo_acwmin << 0); + tmp130__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp130__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19202,7 +19250,7 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp130__; + uint8_t tmp131__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -19211,12 +19259,12 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp130__ = 0U; - tmp130__ |= (pSrc->non_erp_present << 0); - tmp130__ |= (pSrc->use_prot << 1); - tmp130__ |= (pSrc->barker_preamble << 2); - tmp130__ |= (pSrc->unused << 3); - *pBuf = tmp130__; + tmp131__ = 0U; + tmp131__ |= (pSrc->non_erp_present << 0); + tmp131__ |= (pSrc->use_prot << 1); + tmp131__ |= (pSrc->barker_preamble << 2); + tmp131__ |= (pSrc->unused << 3); + *pBuf = tmp131__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -19275,7 +19323,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 tmp131__; + uint8_t tmp132__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -19295,10 +19343,10 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, *pBuf = pSrc->mgmt_state; *pnConsumed += 1; pBuf += 1; - tmp131__ = 0U; - tmp131__ |= (pSrc->mbssid_mask << 0); - tmp131__ |= (pSrc->reserved << 3); - *pBuf = tmp131__; + tmp132__ = 0U; + tmp132__ |= (pSrc->mbssid_mask << 0); + tmp132__ |= (pSrc->reserved << 3); + *pBuf = tmp132__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -19649,7 +19697,7 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp132__; + uint16_t tmp133__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ieft_info(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -19661,10 +19709,10 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; --nBuf; ++(*pnConsumed); - tmp132__ = 0U; - tmp132__ |= (pSrc->reserved << 0); - tmp132__ |= (pSrc->IECount << 8); - frameshtons(pCtx, pBuf, tmp132__, 0); + tmp133__ = 0U; + tmp133__ |= (pSrc->reserved << 0); + tmp133__ |= (pSrc->IECount << 8); + frameshtons(pCtx, pBuf, tmp133__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -19702,11 +19750,11 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp133__; - uint8_t tmp134__; - uint16_t tmp135__; - uint32_t tmp136__; - uint8_t tmp137__; + uint16_t tmp134__; + uint8_t tmp135__; + uint16_t tmp136__; + uint32_t tmp137__; + uint8_t tmp138__; nNeeded += (pSrc->num_rsvd + 26); while (pSrc->present) { if (nNeeded > nBuf) @@ -19715,77 +19763,77 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp133__ = 0U; - tmp133__ |= (pSrc->advCodingCap << 0); - tmp133__ |= (pSrc->supportedChannelWidthSet << 1); - tmp133__ |= (pSrc->mimoPowerSave << 2); - tmp133__ |= (pSrc->greenField << 4); - tmp133__ |= (pSrc->shortGI20MHz << 5); - tmp133__ |= (pSrc->shortGI40MHz << 6); - tmp133__ |= (pSrc->txSTBC << 7); - tmp133__ |= (pSrc->rxSTBC << 8); - tmp133__ |= (pSrc->delayedBA << 10); - tmp133__ |= (pSrc->maximalAMSDUsize << 11); - tmp133__ |= (pSrc->dsssCckMode40MHz << 12); - tmp133__ |= (pSrc->psmp << 13); - tmp133__ |= (pSrc->stbcControlFrame << 14); - tmp133__ |= (pSrc->lsigTXOPProtection << 15); - frameshtons(pCtx, pBuf, tmp133__, 0); + tmp134__ = 0U; + tmp134__ |= (pSrc->advCodingCap << 0); + tmp134__ |= (pSrc->supportedChannelWidthSet << 1); + tmp134__ |= (pSrc->mimoPowerSave << 2); + tmp134__ |= (pSrc->greenField << 4); + tmp134__ |= (pSrc->shortGI20MHz << 5); + tmp134__ |= (pSrc->shortGI40MHz << 6); + tmp134__ |= (pSrc->txSTBC << 7); + tmp134__ |= (pSrc->rxSTBC << 8); + tmp134__ |= (pSrc->delayedBA << 10); + tmp134__ |= (pSrc->maximalAMSDUsize << 11); + tmp134__ |= (pSrc->dsssCckMode40MHz << 12); + tmp134__ |= (pSrc->psmp << 13); + tmp134__ |= (pSrc->stbcControlFrame << 14); + tmp134__ |= (pSrc->lsigTXOPProtection << 15); + frameshtons(pCtx, pBuf, tmp134__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp134__ = 0U; - tmp134__ |= (pSrc->maxRxAMPDUFactor << 0); - tmp134__ |= (pSrc->mpduDensity << 2); - tmp134__ |= (pSrc->reserved1 << 5); - *pBuf = tmp134__; + tmp135__ = 0U; + tmp135__ |= (pSrc->maxRxAMPDUFactor << 0); + tmp135__ |= (pSrc->mpduDensity << 2); + tmp135__ |= (pSrc->reserved1 << 5); + *pBuf = tmp135__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16); *pnConsumed += 16; pBuf += 16; - tmp135__ = 0U; - tmp135__ |= (pSrc->pco << 0); - tmp135__ |= (pSrc->transitionTime << 1); - tmp135__ |= (pSrc->reserved2 << 3); - tmp135__ |= (pSrc->mcsFeedback << 8); - tmp135__ |= (pSrc->reserved3 << 10); - frameshtons(pCtx, pBuf, tmp135__, 0); + tmp136__ = 0U; + tmp136__ |= (pSrc->pco << 0); + tmp136__ |= (pSrc->transitionTime << 1); + tmp136__ |= (pSrc->reserved2 << 3); + tmp136__ |= (pSrc->mcsFeedback << 8); + tmp136__ |= (pSrc->reserved3 << 10); + frameshtons(pCtx, pBuf, tmp136__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp136__ = 0U; - tmp136__ |= (pSrc->txBF << 0); - tmp136__ |= (pSrc->rxStaggeredSounding << 1); - tmp136__ |= (pSrc->txStaggeredSounding << 2); - tmp136__ |= (pSrc->rxZLF << 3); - tmp136__ |= (pSrc->txZLF << 4); - tmp136__ |= (pSrc->implicitTxBF << 5); - tmp136__ |= (pSrc->calibration << 6); - tmp136__ |= (pSrc->explicitCSITxBF << 8); - tmp136__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); - tmp136__ |= (pSrc->explicitBFCSIFeedback << 10); - tmp136__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); - tmp136__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); - tmp136__ |= (pSrc->csiNumBFAntennae << 19); - tmp136__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); - tmp136__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); - tmp136__ |= (pSrc->reserved4 << 25); - frameshtonl(pCtx, pBuf, tmp136__, 0); + tmp137__ = 0U; + tmp137__ |= (pSrc->txBF << 0); + tmp137__ |= (pSrc->rxStaggeredSounding << 1); + tmp137__ |= (pSrc->txStaggeredSounding << 2); + tmp137__ |= (pSrc->rxZLF << 3); + tmp137__ |= (pSrc->txZLF << 4); + tmp137__ |= (pSrc->implicitTxBF << 5); + tmp137__ |= (pSrc->calibration << 6); + tmp137__ |= (pSrc->explicitCSITxBF << 8); + tmp137__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); + tmp137__ |= (pSrc->explicitBFCSIFeedback << 10); + tmp137__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); + tmp137__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); + tmp137__ |= (pSrc->csiNumBFAntennae << 19); + tmp137__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); + tmp137__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); + tmp137__ |= (pSrc->reserved4 << 25); + frameshtonl(pCtx, pBuf, tmp137__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp137__ = 0U; - tmp137__ |= (pSrc->antennaSelection << 0); - tmp137__ |= (pSrc->explicitCSIFeedbackTx << 1); - tmp137__ |= (pSrc->antennaIndicesFeedbackTx << 2); - tmp137__ |= (pSrc->explicitCSIFeedback << 3); - tmp137__ |= (pSrc->antennaIndicesFeedback << 4); - tmp137__ |= (pSrc->rxAS << 5); - tmp137__ |= (pSrc->txSoundingPPDUs << 6); - tmp137__ |= (pSrc->reserved5 << 7); - *pBuf = tmp137__; + tmp138__ = 0U; + tmp138__ |= (pSrc->antennaSelection << 0); + tmp138__ |= (pSrc->explicitCSIFeedbackTx << 1); + tmp138__ |= (pSrc->antennaIndicesFeedbackTx << 2); + tmp138__ |= (pSrc->explicitCSIFeedback << 3); + tmp138__ |= (pSrc->antennaIndicesFeedback << 4); + tmp138__ |= (pSrc->rxAS << 5); + tmp138__ |= (pSrc->txSoundingPPDUs << 6); + tmp138__ |= (pSrc->reserved5 << 7); + *pBuf = tmp138__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19810,9 +19858,9 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp138__; - uint16_t tmp139__; + uint8_t tmp139__; uint16_t tmp140__; + uint16_t tmp141__; nNeeded += (pSrc->num_rsvd + 22); while (pSrc->present) { if (nNeeded > nBuf) @@ -19824,35 +19872,35 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, *pBuf = pSrc->primaryChannel; *pnConsumed += 1; pBuf += 1; - tmp138__ = 0U; - tmp138__ |= (pSrc->secondaryChannelOffset << 0); - tmp138__ |= (pSrc->recommendedTxWidthSet << 2); - tmp138__ |= (pSrc->rifsMode << 3); - tmp138__ |= (pSrc->controlledAccessOnly << 4); - tmp138__ |= (pSrc->serviceIntervalGranularity << 5); - *pBuf = tmp138__; + tmp139__ = 0U; + tmp139__ |= (pSrc->secondaryChannelOffset << 0); + tmp139__ |= (pSrc->recommendedTxWidthSet << 2); + tmp139__ |= (pSrc->rifsMode << 3); + tmp139__ |= (pSrc->controlledAccessOnly << 4); + tmp139__ |= (pSrc->serviceIntervalGranularity << 5); + *pBuf = tmp139__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp139__ = 0U; - tmp139__ |= (pSrc->opMode << 0); - tmp139__ |= (pSrc->nonGFDevicesPresent << 2); - tmp139__ |= (pSrc->transmitBurstLimit << 3); - tmp139__ |= (pSrc->obssNonHTStaPresent << 4); - tmp139__ |= (pSrc->reserved << 5); - frameshtons(pCtx, pBuf, tmp139__, 0); + tmp140__ = 0U; + tmp140__ |= (pSrc->opMode << 0); + tmp140__ |= (pSrc->nonGFDevicesPresent << 2); + tmp140__ |= (pSrc->transmitBurstLimit << 3); + tmp140__ |= (pSrc->obssNonHTStaPresent << 4); + tmp140__ |= (pSrc->reserved << 5); + frameshtons(pCtx, pBuf, tmp140__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp140__ = 0U; - tmp140__ |= (pSrc->basicSTBCMCS << 0); - tmp140__ |= (pSrc->dualCTSProtection << 7); - tmp140__ |= (pSrc->secondaryBeacon << 8); - tmp140__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); - tmp140__ |= (pSrc->pcoActive << 10); - tmp140__ |= (pSrc->pcoPhase << 11); - tmp140__ |= (pSrc->reserved2 << 12); - frameshtons(pCtx, pBuf, tmp140__, 0); + tmp141__ = 0U; + tmp141__ |= (pSrc->basicSTBCMCS << 0); + tmp141__ |= (pSrc->dualCTSProtection << 7); + tmp141__ |= (pSrc->secondaryBeacon << 8); + tmp141__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); + tmp141__ |= (pSrc->pcoActive << 10); + tmp141__ |= (pSrc->pcoPhase << 11); + tmp141__ |= (pSrc->reserved2 << 12); + frameshtons(pCtx, pBuf, tmp141__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -19992,9 +20040,9 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp141__; uint8_t tmp142__; uint8_t tmp143__; + uint8_t tmp144__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20009,12 +20057,12 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, *pBuf = pSrc->token; *pnConsumed += 1; pBuf += 1; - tmp141__ = 0U; - tmp141__ |= (pSrc->late << 0); - tmp141__ |= (pSrc->incapable << 1); - tmp141__ |= (pSrc->refused << 2); - tmp141__ |= (pSrc->unused << 3); - *pBuf = tmp141__; + tmp142__ = 0U; + tmp142__ |= (pSrc->late << 0); + tmp142__ |= (pSrc->incapable << 1); + tmp142__ |= (pSrc->refused << 2); + tmp142__ |= (pSrc->unused << 3); + *pBuf = tmp142__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20033,14 +20081,14 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp142__ = 0U; - tmp142__ |= (pSrc->report.Basic.bss << 0); - tmp142__ |= (pSrc->report.Basic.ofdm_preamble << 1); - tmp142__ |= (pSrc->report.Basic.unid_signal << 2); - tmp142__ |= (pSrc->report.Basic.rader << 3); - tmp142__ |= (pSrc->report.Basic.unmeasured << 4); - tmp142__ |= (pSrc->report.Basic.unused << 5); - *pBuf = tmp142__; + tmp143__ = 0U; + tmp143__ |= (pSrc->report.Basic.bss << 0); + tmp143__ |= (pSrc->report.Basic.ofdm_preamble << 1); + tmp143__ |= (pSrc->report.Basic.unid_signal << 2); + tmp143__ |= (pSrc->report.Basic.rader << 3); + tmp143__ |= (pSrc->report.Basic.unmeasured << 4); + tmp143__ |= (pSrc->report.Basic.unused << 5); + *pBuf = tmp143__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20107,10 +20155,10 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp143__ = 0U; - tmp143__ |= (pSrc->report.Beacon.condensed_PHY << 0); - tmp143__ |= (pSrc->report.Beacon.reported_frame_type << 7); - *pBuf = tmp143__; + tmp144__ = 0U; + tmp144__ |= (pSrc->report.Beacon.condensed_PHY << 0); + tmp144__ |= (pSrc->report.Beacon.reported_frame_type << 7); + *pBuf = tmp144__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20159,7 +20207,7 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp144__; + uint8_t tmp145__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_request(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20174,14 +20222,14 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, *pBuf = pSrc->measurement_token; *pnConsumed += 1; pBuf += 1; - tmp144__ = 0U; - tmp144__ |= (pSrc->parallel << 0); - tmp144__ |= (pSrc->enable << 1); - tmp144__ |= (pSrc->request << 2); - tmp144__ |= (pSrc->report << 3); - tmp144__ |= (pSrc->durationMandatory << 4); - tmp144__ |= (pSrc->unused << 5); - *pBuf = tmp144__; + tmp145__ = 0U; + tmp145__ |= (pSrc->parallel << 0); + tmp145__ |= (pSrc->enable << 1); + tmp145__ |= (pSrc->request << 2); + tmp145__ |= (pSrc->report << 3); + tmp145__ |= (pSrc->durationMandatory << 4); + tmp145__ |= (pSrc->unused << 5); + *pBuf = tmp145__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20295,7 +20343,7 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp145__; + uint8_t tmp146__; nNeeded += 3; while (pSrc->present) { if (nNeeded > nBuf) @@ -20307,11 +20355,11 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->MDID, 0); *pnConsumed += 2; pBuf += 2; - tmp145__ = 0U; - tmp145__ |= (pSrc->overDSCap << 0); - tmp145__ |= (pSrc->resourceReqCap << 1); - tmp145__ |= (pSrc->reserved << 2); - *pBuf = tmp145__; + tmp146__ = 0U; + tmp146__ |= (pSrc->overDSCap << 0); + tmp146__ |= (pSrc->resourceReqCap << 1); + tmp146__ |= (pSrc->reserved << 2); + *pBuf = tmp146__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20333,8 +20381,8 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp146__; uint8_t tmp147__; + uint8_t tmp148__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -20349,24 +20397,24 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp146__ = 0U; - tmp146__ |= (pSrc->APReachability << 0); - tmp146__ |= (pSrc->Security << 2); - tmp146__ |= (pSrc->KeyScope << 3); - tmp146__ |= (pSrc->SpecMgmtCap << 4); - tmp146__ |= (pSrc->QosCap << 5); - tmp146__ |= (pSrc->apsd << 6); - tmp146__ |= (pSrc->rrm << 7); - *pBuf = tmp146__; + tmp147__ = 0U; + tmp147__ |= (pSrc->APReachability << 0); + tmp147__ |= (pSrc->Security << 2); + tmp147__ |= (pSrc->KeyScope << 3); + tmp147__ |= (pSrc->SpecMgmtCap << 4); + tmp147__ |= (pSrc->QosCap << 5); + tmp147__ |= (pSrc->apsd << 6); + tmp147__ |= (pSrc->rrm << 7); + *pBuf = tmp147__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp147__ = 0U; - tmp147__ |= (pSrc->DelayedBA << 0); - tmp147__ |= (pSrc->ImmBA << 1); - tmp147__ |= (pSrc->MobilityDomain << 2); - tmp147__ |= (pSrc->reserved << 3); - *pBuf = tmp147__; + tmp148__ = 0U; + tmp148__ |= (pSrc->DelayedBA << 0); + tmp148__ |= (pSrc->ImmBA << 1); + tmp148__ |= (pSrc->MobilityDomain << 2); + tmp148__ |= (pSrc->reserved << 3); + *pBuf = tmp148__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -20454,7 +20502,7 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp148__; + uint8_t tmp149__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -20463,12 +20511,12 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp148__ = 0U; - tmp148__ |= (pSrc->chanWidth << 0); - tmp148__ |= (pSrc->reserved << 2); - tmp148__ |= (pSrc->rxNSS << 4); - tmp148__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp148__; + tmp149__ = 0U; + tmp149__ |= (pSrc->chanWidth << 0); + tmp149__ |= (pSrc->reserved << 2); + tmp149__ |= (pSrc->rxNSS << 4); + tmp149__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp149__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20943,7 +20991,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 tmp149__; + uint8_t tmp150__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -20952,13 +21000,13 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp149__ = 0U; - tmp149__ |= (pSrc->ac_bk_traffic_aval << 0); - tmp149__ |= (pSrc->ac_be_traffic_aval << 1); - tmp149__ |= (pSrc->ac_vi_traffic_aval << 2); - tmp149__ |= (pSrc->ac_vo_traffic_aval << 3); - tmp149__ |= (pSrc->reserved << 4); - *pBuf = tmp149__; + tmp150__ = 0U; + tmp150__ |= (pSrc->ac_bk_traffic_aval << 0); + tmp150__ |= (pSrc->ac_be_traffic_aval << 1); + tmp150__ |= (pSrc->ac_vi_traffic_aval << 2); + tmp150__ |= (pSrc->ac_vo_traffic_aval << 3); + tmp150__ |= (pSrc->reserved << 4); + *pBuf = tmp150__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21151,7 +21199,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 tmp150__; + uint8_t tmp151__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -21160,13 +21208,13 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp150__ = 0U; - tmp150__ |= (pSrc->count << 0); - tmp150__ |= (pSrc->qack << 4); - tmp150__ |= (pSrc->qreq << 5); - tmp150__ |= (pSrc->txopreq << 6); - tmp150__ |= (pSrc->reserved << 7); - *pBuf = tmp150__; + tmp151__ = 0U; + tmp151__ |= (pSrc->count << 0); + tmp151__ |= (pSrc->qack << 4); + tmp151__ |= (pSrc->qreq << 5); + tmp151__ |= (pSrc->txopreq << 6); + tmp151__ |= (pSrc->reserved << 7); + *pBuf = tmp151__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21188,7 +21236,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 tmp151__; + uint8_t tmp152__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -21197,15 +21245,15 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp151__ = 0U; - tmp151__ |= (pSrc->acvo_uapsd << 0); - tmp151__ |= (pSrc->acvi_uapsd << 1); - tmp151__ |= (pSrc->acbk_uapsd << 2); - tmp151__ |= (pSrc->acbe_uapsd << 3); - tmp151__ |= (pSrc->qack << 4); - tmp151__ |= (pSrc->max_sp_length << 5); - tmp151__ |= (pSrc->more_data_ack << 7); - *pBuf = tmp151__; + tmp152__ = 0U; + tmp152__ |= (pSrc->acvo_uapsd << 0); + tmp152__ |= (pSrc->acvi_uapsd << 1); + tmp152__ |= (pSrc->acbk_uapsd << 2); + tmp152__ |= (pSrc->acbe_uapsd << 3); + tmp152__ |= (pSrc->qack << 4); + tmp152__ |= (pSrc->max_sp_length << 5); + tmp152__ |= (pSrc->more_data_ack << 7); + *pBuf = tmp152__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -21840,7 +21888,7 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp152__; + uint16_t tmp153__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_iewapi(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -21870,10 +21918,10 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4); *pnConsumed += 4; pBuf += 4; - tmp152__ = 0U; - tmp152__ |= (pSrc->preauth << 0); - tmp152__ |= (pSrc->reserved << 1); - frameshtons(pCtx, pBuf, tmp152__, 0); + tmp153__ = 0U; + tmp153__ |= (pSrc->preauth << 0); + tmp153__ |= (pSrc->reserved << 1); + frameshtons(pCtx, pBuf, tmp153__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -22013,7 +22061,7 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp153__; + uint8_t tmp154__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22035,13 +22083,13 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp153__ = 0U; - tmp153__ |= (pSrc->reserved << 0); - tmp153__ |= (pSrc->qack << 4); - tmp153__ |= (pSrc->queue_request << 5); - tmp153__ |= (pSrc->txop_request << 6); - tmp153__ |= (pSrc->more_ack << 7); - *pBuf = tmp153__; + tmp154__ = 0U; + tmp154__ |= (pSrc->reserved << 0); + tmp154__ |= (pSrc->qack << 4); + tmp154__ |= (pSrc->queue_request << 5); + tmp154__ |= (pSrc->txop_request << 6); + tmp154__ |= (pSrc->more_ack << 7); + *pBuf = tmp154__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -22059,54 +22107,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 tmp154__; - 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; - tmp154__ = 0U; - tmp154__ |= (pSrc->param_set_count << 0); - tmp154__ |= (pSrc->reserved << 4); - tmp154__ |= (pSrc->uapsd << 7); - *pBuf = tmp154__; - *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; @@ -22134,13 +22134,9 @@ uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, *pnConsumed += 1; pBuf += 1; tmp155__ = 0U; - tmp155__ |= (pSrc->acvo_uapsd << 0); - tmp155__ |= (pSrc->acvi_uapsd << 1); - tmp155__ |= (pSrc->acbk_uapsd << 2); - tmp155__ |= (pSrc->acbe_uapsd << 3); - tmp155__ |= (pSrc->reserved1 << 4); - tmp155__ |= (pSrc->max_sp_length << 5); - tmp155__ |= (pSrc->reserved2 << 7); + tmp155__ |= (pSrc->param_set_count << 0); + tmp155__ |= (pSrc->reserved << 4); + tmp155__ |= (pSrc->uapsd << 7); *pBuf = tmp155__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ @@ -22152,6 +22148,58 @@ 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 tmp156__; + nNeeded += 2; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 221; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x50; + ++pBuf; ++(*pnConsumed); + *pBuf = 0xf2; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x2; + ++pBuf; ++(*pnConsumed); + *pBuf = 0x0; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->version; + *pnConsumed += 1; + pBuf += 1; + tmp156__ = 0U; + tmp156__ |= (pSrc->acvo_uapsd << 0); + tmp156__ |= (pSrc->acvi_uapsd << 1); + tmp156__ |= (pSrc->acbk_uapsd << 2); + tmp156__ |= (pSrc->acbe_uapsd << 3); + tmp156__ |= (pSrc->reserved1 << 4); + tmp156__ |= (pSrc->max_sp_length << 5); + tmp156__ |= (pSrc->reserved2 << 7); + *pBuf = tmp156__; + *pnConsumed += 1; + /* fieldsEndFlag = 1 */ + nBuf -= 1 ; + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_wmm_info_station. */ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, @@ -22163,7 +22211,6 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp156__; uint8_t tmp157__; uint8_t tmp158__; uint8_t tmp159__; @@ -22171,6 +22218,7 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t tmp161__; uint8_t tmp162__; uint8_t tmp163__; + uint8_t tmp164__; nNeeded += 19; while (pSrc->present) { if (nNeeded > nBuf) @@ -22198,76 +22246,76 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved2; *pnConsumed += 1; pBuf += 1; - tmp156__ = 0U; - tmp156__ |= (pSrc->acbe_aifsn << 0); - tmp156__ |= (pSrc->acbe_acm << 4); - tmp156__ |= (pSrc->acbe_aci << 5); - tmp156__ |= (pSrc->unused1 << 7); - *pBuf = tmp156__; + tmp157__ = 0U; + tmp157__ |= (pSrc->acbe_aifsn << 0); + tmp157__ |= (pSrc->acbe_acm << 4); + tmp157__ |= (pSrc->acbe_aci << 5); + tmp157__ |= (pSrc->unused1 << 7); + *pBuf = tmp157__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp157__ = 0U; - tmp157__ |= (pSrc->acbe_acwmin << 0); - tmp157__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp157__; + tmp158__ = 0U; + tmp158__ |= (pSrc->acbe_acwmin << 0); + tmp158__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp158__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp158__ = 0U; - tmp158__ |= (pSrc->acbk_aifsn << 0); - tmp158__ |= (pSrc->acbk_acm << 4); - tmp158__ |= (pSrc->acbk_aci << 5); - tmp158__ |= (pSrc->unused2 << 7); - *pBuf = tmp158__; + tmp159__ = 0U; + tmp159__ |= (pSrc->acbk_aifsn << 0); + tmp159__ |= (pSrc->acbk_acm << 4); + tmp159__ |= (pSrc->acbk_aci << 5); + tmp159__ |= (pSrc->unused2 << 7); + *pBuf = tmp159__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp159__ = 0U; - tmp159__ |= (pSrc->acbk_acwmin << 0); - tmp159__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp159__; + tmp160__ = 0U; + tmp160__ |= (pSrc->acbk_acwmin << 0); + tmp160__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp160__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp160__ = 0U; - tmp160__ |= (pSrc->acvi_aifsn << 0); - tmp160__ |= (pSrc->acvi_acm << 4); - tmp160__ |= (pSrc->acvi_aci << 5); - tmp160__ |= (pSrc->unused3 << 7); - *pBuf = tmp160__; + tmp161__ = 0U; + tmp161__ |= (pSrc->acvi_aifsn << 0); + tmp161__ |= (pSrc->acvi_acm << 4); + tmp161__ |= (pSrc->acvi_aci << 5); + tmp161__ |= (pSrc->unused3 << 7); + *pBuf = tmp161__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp161__ = 0U; - tmp161__ |= (pSrc->acvi_acwmin << 0); - tmp161__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp161__; + tmp162__ = 0U; + tmp162__ |= (pSrc->acvi_acwmin << 0); + tmp162__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp162__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp162__ = 0U; - tmp162__ |= (pSrc->acvo_aifsn << 0); - tmp162__ |= (pSrc->acvo_acm << 4); - tmp162__ |= (pSrc->acvo_aci << 5); - tmp162__ |= (pSrc->unused4 << 7); - *pBuf = tmp162__; + tmp163__ = 0U; + tmp163__ |= (pSrc->acvo_aifsn << 0); + tmp163__ |= (pSrc->acvo_acm << 4); + tmp163__ |= (pSrc->acvo_aci << 5); + tmp163__ |= (pSrc->unused4 << 7); + *pBuf = tmp163__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp163__ = 0U; - tmp163__ |= (pSrc->acvo_acwmin << 0); - tmp163__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp163__; + tmp164__ = 0U; + tmp164__ |= (pSrc->acvo_acwmin << 0); + tmp164__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp164__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -22815,6 +22863,41 @@ uint32_t dot11f_pack_ie_wsc_reassoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_pack_ie_wsc_reassoc_res. */ +uint32_t dot11f_pack_ie_addba_extn_element(tpAniSirGlobal pCtx, + tDot11fIEaddba_extn_element *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + uint8_t tmp165__; + nNeeded += 1; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 159; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + tmp165__ = 0U; + tmp165__ |= (pSrc->no_fragmentation << 0); + tmp165__ |= (pSrc->he_frag_operation << 1); + tmp165__ |= (pSrc->reserved << 3); + *pBuf = tmp165__; + *pnConsumed += 1; + /* fieldsEndFlag = 1 */ + nBuf -= 1 ; + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_addba_extn_element. */ + uint32_t dot11f_pack_ie_bss_color_change(tpAniSirGlobal pCtx, tDot11fIEbss_color_change *pSrc, uint8_t *pBuf, @@ -22824,7 +22907,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 tmp164__; + uint8_t tmp166__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -22844,10 +22927,10 @@ uint32_t dot11f_pack_ie_bss_color_change(tpAniSirGlobal pCtx, *pBuf = pSrc->countdown; *pnConsumed += 1; pBuf += 1; - tmp164__ = 0U; - tmp164__ |= (pSrc->new_color << 0); - tmp164__ |= (pSrc->reserved << 6); - *pBuf = tmp164__; + tmp166__ = 0U; + tmp166__ |= (pSrc->new_color << 0); + tmp166__ |= (pSrc->reserved << 6); + *pBuf = tmp166__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -23040,7 +23123,7 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp165__; + uint16_t tmp167__; nNeeded += (pSrc->num_variable_data + 2); while (pSrc->present) { if (nNeeded > nBuf) @@ -23049,17 +23132,17 @@ uint32_t dot11f_pack_ie_fils_indication(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp165__ = 0U; - tmp165__ |= (pSrc->public_key_identifiers_cnt << 0); - tmp165__ |= (pSrc->realm_identifiers_cnt << 3); - tmp165__ |= (pSrc->is_ip_config_supported << 6); - tmp165__ |= (pSrc->is_cache_id_present << 7); - tmp165__ |= (pSrc->is_hessid_present << 8); - tmp165__ |= (pSrc->is_fils_sk_auth_supported << 9); - tmp165__ |= (pSrc->is_fils_sk_auth_pfs_supported << 10); - tmp165__ |= (pSrc->is_pk_auth_supported << 11); - tmp165__ |= (pSrc->reserved << 12); - frameshtons(pCtx, pBuf, tmp165__, 0); + tmp167__ = 0U; + tmp167__ |= (pSrc->public_key_identifiers_cnt << 0); + tmp167__ |= (pSrc->realm_identifiers_cnt << 3); + tmp167__ |= (pSrc->is_ip_config_supported << 6); + tmp167__ |= (pSrc->is_cache_id_present << 7); + tmp167__ |= (pSrc->is_hessid_present << 8); + tmp167__ |= (pSrc->is_fils_sk_auth_supported << 9); + tmp167__ |= (pSrc->is_fils_sk_auth_pfs_supported << 10); + tmp167__ |= (pSrc->is_pk_auth_supported << 11); + tmp167__ |= (pSrc->reserved << 12); + frameshtons(pCtx, pBuf, tmp167__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -23305,11 +23388,11 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp166__; - uint8_t tmp167__; uint32_t tmp168__; - uint32_t tmp169__; - uint8_t tmp170__; + uint8_t tmp169__; + uint32_t tmp170__; + uint32_t tmp171__; + uint8_t tmp172__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_cap(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23323,106 +23406,106 @@ uint32_t dot11f_pack_ie_he_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 35; ++pBuf; ++(*pnConsumed); - tmp166__ = 0U; - tmp166__ |= (pSrc->htc_he << 0); - tmp166__ |= (pSrc->twt_request << 1); - tmp166__ |= (pSrc->twt_responder << 2); - tmp166__ |= (pSrc->fragmentation << 3); - tmp166__ |= (pSrc->max_num_frag_msdu << 5); - tmp166__ |= (pSrc->min_frag_size << 8); - tmp166__ |= (pSrc->trigger_frm_mac_pad << 10); - tmp166__ |= (pSrc->multi_tid_aggr << 12); - tmp166__ |= (pSrc->he_link_adaptation << 15); - tmp166__ |= (pSrc->all_ack << 17); - tmp166__ |= (pSrc->ul_mu_rsp_sched << 18); - tmp166__ |= (pSrc->a_bsr << 19); - tmp166__ |= (pSrc->broadcast_twt << 20); - tmp166__ |= (pSrc->ba_32bit_bitmap << 21); - tmp166__ |= (pSrc->mu_cascade << 22); - tmp166__ |= (pSrc->ack_enabled_multitid << 23); - tmp166__ |= (pSrc->dl_mu_ba << 24); - tmp166__ |= (pSrc->omi_a_ctrl << 25); - tmp166__ |= (pSrc->ofdma_ra << 26); - tmp166__ |= (pSrc->max_ampdu_len << 27); - tmp166__ |= (pSrc->amsdu_frag << 29); - tmp166__ |= (pSrc->flex_twt_sched << 30); - tmp166__ |= (pSrc->rx_ctrl_frame << 31); - frameshtonl(pCtx, pBuf, tmp166__, 0); - *pnConsumed += 4; - pBuf += 4; - nBuf -= 4 ; - tmp167__ = 0U; - tmp167__ |= (pSrc->bsrp_ampdu_aggr << 0); - tmp167__ |= (pSrc->qtp << 1); - tmp167__ |= (pSrc->a_bqr << 2); - tmp167__ |= (pSrc->sr_responder << 3); - tmp167__ |= (pSrc->ndp_feedback_supp << 4); - tmp167__ |= (pSrc->ops_supp << 5); - tmp167__ |= (pSrc->amsdu_in_ampdu << 6); - tmp167__ |= (pSrc->reserved1 << 7); - *pBuf = tmp167__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp168__ = 0U; - tmp168__ |= (pSrc->dual_band << 0); - tmp168__ |= (pSrc->chan_width_0 << 1); - tmp168__ |= (pSrc->chan_width_1 << 2); - tmp168__ |= (pSrc->chan_width_2 << 3); - tmp168__ |= (pSrc->chan_width_3 << 4); - tmp168__ |= (pSrc->chan_width_4 << 5); - tmp168__ |= (pSrc->chan_width_5 << 6); - tmp168__ |= (pSrc->chan_width_6 << 7); - tmp168__ |= (pSrc->rx_pream_puncturing << 8); - tmp168__ |= (pSrc->device_class << 12); - tmp168__ |= (pSrc->ldpc_coding << 13); - tmp168__ |= (pSrc->he_1x_ltf_800_gi_ppdu << 14); - tmp168__ |= (pSrc->midamble_rx_max_nsts << 15); - tmp168__ |= (pSrc->he_4x_ltf_3200_gi_ndp << 17); - tmp168__ |= (pSrc->stbc_lt_80mhz << 18); - tmp168__ |= (pSrc->doppler << 20); - tmp168__ |= (pSrc->ul_mu << 22); - tmp168__ |= (pSrc->dcm_enc_tx << 24); - tmp168__ |= (pSrc->dcm_enc_rx << 27); - tmp168__ |= (pSrc->ul_he_mu << 30); - tmp168__ |= (pSrc->su_beamformer << 31); + tmp168__ |= (pSrc->htc_he << 0); + tmp168__ |= (pSrc->twt_request << 1); + tmp168__ |= (pSrc->twt_responder << 2); + tmp168__ |= (pSrc->fragmentation << 3); + tmp168__ |= (pSrc->max_num_frag_msdu << 5); + tmp168__ |= (pSrc->min_frag_size << 8); + tmp168__ |= (pSrc->trigger_frm_mac_pad << 10); + tmp168__ |= (pSrc->multi_tid_aggr << 12); + tmp168__ |= (pSrc->he_link_adaptation << 15); + tmp168__ |= (pSrc->all_ack << 17); + tmp168__ |= (pSrc->ul_mu_rsp_sched << 18); + tmp168__ |= (pSrc->a_bsr << 19); + tmp168__ |= (pSrc->broadcast_twt << 20); + tmp168__ |= (pSrc->ba_32bit_bitmap << 21); + tmp168__ |= (pSrc->mu_cascade << 22); + tmp168__ |= (pSrc->ack_enabled_multitid << 23); + tmp168__ |= (pSrc->dl_mu_ba << 24); + tmp168__ |= (pSrc->omi_a_ctrl << 25); + tmp168__ |= (pSrc->ofdma_ra << 26); + tmp168__ |= (pSrc->max_ampdu_len << 27); + tmp168__ |= (pSrc->amsdu_frag << 29); + tmp168__ |= (pSrc->flex_twt_sched << 30); + tmp168__ |= (pSrc->rx_ctrl_frame << 31); frameshtonl(pCtx, pBuf, tmp168__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; tmp169__ = 0U; - tmp169__ |= (pSrc->su_beamformee << 0); - tmp169__ |= (pSrc->mu_beamformer << 1); - tmp169__ |= (pSrc->bfee_sts_lt_80 << 2); - tmp169__ |= (pSrc->bfee_sts_gt_80 << 5); - tmp169__ |= (pSrc->num_sounding_lt_80 << 8); - tmp169__ |= (pSrc->num_sounding_gt_80 << 11); - tmp169__ |= (pSrc->su_feedback_tone16 << 14); - tmp169__ |= (pSrc->mu_feedback_tone16 << 15); - tmp169__ |= (pSrc->codebook_su << 16); - tmp169__ |= (pSrc->codebook_mu << 17); - tmp169__ |= (pSrc->beamforming_feedback << 18); - tmp169__ |= (pSrc->he_er_su_ppdu << 21); - tmp169__ |= (pSrc->dl_mu_mimo_part_bw << 22); - tmp169__ |= (pSrc->ppet_present << 23); - tmp169__ |= (pSrc->srp << 24); - tmp169__ |= (pSrc->power_boost << 25); - tmp169__ |= (pSrc->he_ltf_800_gi_4x << 26); - tmp169__ |= (pSrc->max_nc << 27); - tmp169__ |= (pSrc->stbc_gt_80mhz << 30); - frameshtonl(pCtx, pBuf, tmp169__, 0); + tmp169__ |= (pSrc->bsrp_ampdu_aggr << 0); + tmp169__ |= (pSrc->qtp << 1); + tmp169__ |= (pSrc->a_bqr << 2); + tmp169__ |= (pSrc->sr_responder << 3); + tmp169__ |= (pSrc->ndp_feedback_supp << 4); + tmp169__ |= (pSrc->ops_supp << 5); + tmp169__ |= (pSrc->amsdu_in_ampdu << 6); + tmp169__ |= (pSrc->reserved1 << 7); + *pBuf = tmp169__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp170__ = 0U; + tmp170__ |= (pSrc->dual_band << 0); + tmp170__ |= (pSrc->chan_width_0 << 1); + tmp170__ |= (pSrc->chan_width_1 << 2); + tmp170__ |= (pSrc->chan_width_2 << 3); + tmp170__ |= (pSrc->chan_width_3 << 4); + tmp170__ |= (pSrc->chan_width_4 << 5); + tmp170__ |= (pSrc->chan_width_5 << 6); + tmp170__ |= (pSrc->chan_width_6 << 7); + tmp170__ |= (pSrc->rx_pream_puncturing << 8); + tmp170__ |= (pSrc->device_class << 12); + tmp170__ |= (pSrc->ldpc_coding << 13); + tmp170__ |= (pSrc->he_1x_ltf_800_gi_ppdu << 14); + tmp170__ |= (pSrc->midamble_rx_max_nsts << 15); + tmp170__ |= (pSrc->he_4x_ltf_3200_gi_ndp << 17); + tmp170__ |= (pSrc->stbc_lt_80mhz << 18); + tmp170__ |= (pSrc->doppler << 20); + tmp170__ |= (pSrc->ul_mu << 22); + tmp170__ |= (pSrc->dcm_enc_tx << 24); + tmp170__ |= (pSrc->dcm_enc_rx << 27); + tmp170__ |= (pSrc->ul_he_mu << 30); + tmp170__ |= (pSrc->su_beamformer << 31); + frameshtonl(pCtx, pBuf, tmp170__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp170__ = 0U; - tmp170__ |= (pSrc->er_he_ltf_800_gi_4x << 0); - tmp170__ |= (pSrc->he_ppdu_20_in_40Mhz_2G << 1); - tmp170__ |= (pSrc->he_ppdu_20_in_160_80p80Mhz << 2); - tmp170__ |= (pSrc->he_ppdu_80_in_160_80p80Mhz << 3); - tmp170__ |= (pSrc->er_1x_he_ltf_gi << 4); - tmp170__ |= (pSrc->midamble_rx_1x_he_ltf << 5); - tmp170__ |= (pSrc->reserved2 << 6); - *pBuf = tmp170__; + tmp171__ = 0U; + tmp171__ |= (pSrc->su_beamformee << 0); + tmp171__ |= (pSrc->mu_beamformer << 1); + tmp171__ |= (pSrc->bfee_sts_lt_80 << 2); + tmp171__ |= (pSrc->bfee_sts_gt_80 << 5); + tmp171__ |= (pSrc->num_sounding_lt_80 << 8); + tmp171__ |= (pSrc->num_sounding_gt_80 << 11); + tmp171__ |= (pSrc->su_feedback_tone16 << 14); + tmp171__ |= (pSrc->mu_feedback_tone16 << 15); + tmp171__ |= (pSrc->codebook_su << 16); + tmp171__ |= (pSrc->codebook_mu << 17); + tmp171__ |= (pSrc->beamforming_feedback << 18); + tmp171__ |= (pSrc->he_er_su_ppdu << 21); + tmp171__ |= (pSrc->dl_mu_mimo_part_bw << 22); + tmp171__ |= (pSrc->ppet_present << 23); + tmp171__ |= (pSrc->srp << 24); + tmp171__ |= (pSrc->power_boost << 25); + tmp171__ |= (pSrc->he_ltf_800_gi_4x << 26); + tmp171__ |= (pSrc->max_nc << 27); + tmp171__ |= (pSrc->stbc_gt_80mhz << 30); + frameshtonl(pCtx, pBuf, tmp171__, 0); + *pnConsumed += 4; + pBuf += 4; + nBuf -= 4 ; + tmp172__ = 0U; + tmp172__ |= (pSrc->er_he_ltf_800_gi_4x << 0); + tmp172__ |= (pSrc->he_ppdu_20_in_40Mhz_2G << 1); + tmp172__ |= (pSrc->he_ppdu_20_in_160_80p80Mhz << 2); + tmp172__ |= (pSrc->he_ppdu_80_in_160_80p80Mhz << 3); + tmp172__ |= (pSrc->er_1x_he_ltf_gi << 4); + tmp172__ |= (pSrc->midamble_rx_1x_he_ltf << 5); + tmp172__ |= (pSrc->reserved2 << 6); + *pBuf = tmp172__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -23473,7 +23556,7 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp171__; + uint32_t tmp173__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_he_op(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23487,19 +23570,19 @@ uint32_t dot11f_pack_ie_he_op(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 36; ++pBuf; ++(*pnConsumed); - tmp171__ = 0U; - tmp171__ |= (pSrc->bss_color << 0); - tmp171__ |= (pSrc->default_pe << 6); - tmp171__ |= (pSrc->twt_required << 9); - tmp171__ |= (pSrc->rts_threshold << 10); - tmp171__ |= (pSrc->partial_bss_col << 20); - tmp171__ |= (pSrc->vht_oper_present << 21); - tmp171__ |= (pSrc->reserved1 << 22); - tmp171__ |= (pSrc->mbssid_ap << 28); - tmp171__ |= (pSrc->tx_bssid_ind << 29); - tmp171__ |= (pSrc->bss_col_disabled << 30); - tmp171__ |= (pSrc->reserved2 << 31); - frameshtonl(pCtx, pBuf, tmp171__, 0); + tmp173__ = 0U; + tmp173__ |= (pSrc->bss_color << 0); + tmp173__ |= (pSrc->default_pe << 6); + tmp173__ |= (pSrc->twt_required << 9); + tmp173__ |= (pSrc->rts_threshold << 10); + tmp173__ |= (pSrc->partial_bss_col << 20); + tmp173__ |= (pSrc->vht_oper_present << 21); + tmp173__ |= (pSrc->reserved1 << 22); + tmp173__ |= (pSrc->mbssid_ap << 28); + tmp173__ |= (pSrc->tx_bssid_ind << 29); + tmp173__ |= (pSrc->bss_col_disabled << 30); + tmp173__ |= (pSrc->reserved2 << 31); + frameshtonl(pCtx, pBuf, tmp173__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; @@ -23552,7 +23635,7 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp172__; + uint8_t tmp174__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_hs20vendor_ie(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -23572,12 +23655,12 @@ uint32_t dot11f_pack_ie_hs20vendor_ie(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); *pBuf = 0x10; ++pBuf; ++(*pnConsumed); - tmp172__ = 0U; - tmp172__ |= (pSrc->dgaf_dis << 0); - tmp172__ |= (pSrc->hs_id_present << 1); - tmp172__ |= (pSrc->reserved << 3); - tmp172__ |= (pSrc->release_num << 4); - *pBuf = tmp172__; + tmp174__ = 0U; + tmp174__ |= (pSrc->dgaf_dis << 0); + tmp174__ |= (pSrc->hs_id_present << 1); + tmp174__ |= (pSrc->reserved << 3); + tmp174__ |= (pSrc->release_num << 4); + *pBuf = tmp174__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -23615,7 +23698,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 tmp173__; + uint8_t tmp175__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -23624,14 +23707,14 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp173__ = 0U; - tmp173__ |= (pSrc->info_request << 0); - tmp173__ |= (pSrc->forty_mhz_intolerant << 1); - tmp173__ |= (pSrc->twenty_mhz_bsswidth_req << 2); - tmp173__ |= (pSrc->obss_scan_exemption_req << 3); - tmp173__ |= (pSrc->obss_scan_exemption_grant << 4); - tmp173__ |= (pSrc->unused << 5); - *pBuf = tmp173__; + tmp175__ = 0U; + tmp175__ |= (pSrc->info_request << 0); + tmp175__ |= (pSrc->forty_mhz_intolerant << 1); + tmp175__ |= (pSrc->twenty_mhz_bsswidth_req << 2); + tmp175__ |= (pSrc->obss_scan_exemption_req << 3); + tmp175__ |= (pSrc->obss_scan_exemption_grant << 4); + tmp175__ |= (pSrc->unused << 5); + *pBuf = tmp175__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -23685,14 +23768,14 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp174__; - uint8_t tmp175__; uint8_t tmp176__; uint8_t tmp177__; uint8_t tmp178__; uint8_t tmp179__; uint8_t tmp180__; uint8_t tmp181__; + uint8_t tmp182__; + uint8_t tmp183__; nNeeded += 13; while (pSrc->present) { if (nNeeded > nBuf) @@ -23712,76 +23795,76 @@ uint32_t dot11f_pack_ie_mu_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->qos; *pnConsumed += 1; pBuf += 1; - tmp174__ = 0U; - tmp174__ |= (pSrc->acbe_aifsn << 0); - tmp174__ |= (pSrc->acbe_acm << 4); - tmp174__ |= (pSrc->acbe_aci << 5); - tmp174__ |= (pSrc->unused1 << 7); - *pBuf = tmp174__; + tmp176__ = 0U; + tmp176__ |= (pSrc->acbe_aifsn << 0); + tmp176__ |= (pSrc->acbe_acm << 4); + tmp176__ |= (pSrc->acbe_aci << 5); + tmp176__ |= (pSrc->unused1 << 7); + *pBuf = tmp176__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp175__ = 0U; - tmp175__ |= (pSrc->acbe_acwmin << 0); - tmp175__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp175__; + tmp177__ = 0U; + tmp177__ |= (pSrc->acbe_acwmin << 0); + tmp177__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp177__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acbe_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp176__ = 0U; - tmp176__ |= (pSrc->acbk_aifsn << 0); - tmp176__ |= (pSrc->acbk_acm << 4); - tmp176__ |= (pSrc->acbk_aci << 5); - tmp176__ |= (pSrc->unused2 << 7); - *pBuf = tmp176__; + tmp178__ = 0U; + tmp178__ |= (pSrc->acbk_aifsn << 0); + tmp178__ |= (pSrc->acbk_acm << 4); + tmp178__ |= (pSrc->acbk_aci << 5); + tmp178__ |= (pSrc->unused2 << 7); + *pBuf = tmp178__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp177__ = 0U; - tmp177__ |= (pSrc->acbk_acwmin << 0); - tmp177__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp177__; + tmp179__ = 0U; + tmp179__ |= (pSrc->acbk_acwmin << 0); + tmp179__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp179__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acbk_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp178__ = 0U; - tmp178__ |= (pSrc->acvi_aifsn << 0); - tmp178__ |= (pSrc->acvi_acm << 4); - tmp178__ |= (pSrc->acvi_aci << 5); - tmp178__ |= (pSrc->unused3 << 7); - *pBuf = tmp178__; + tmp180__ = 0U; + tmp180__ |= (pSrc->acvi_aifsn << 0); + tmp180__ |= (pSrc->acvi_acm << 4); + tmp180__ |= (pSrc->acvi_aci << 5); + tmp180__ |= (pSrc->unused3 << 7); + *pBuf = tmp180__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp179__ = 0U; - tmp179__ |= (pSrc->acvi_acwmin << 0); - tmp179__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp179__; + tmp181__ = 0U; + tmp181__ |= (pSrc->acvi_acwmin << 0); + tmp181__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp181__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; *pBuf = pSrc->acvi_muedca_timer; *pnConsumed += 1; pBuf += 1; - tmp180__ = 0U; - tmp180__ |= (pSrc->acvo_aifsn << 0); - tmp180__ |= (pSrc->acvo_acm << 4); - tmp180__ |= (pSrc->acvo_aci << 5); - tmp180__ |= (pSrc->unused4 << 7); - *pBuf = tmp180__; + tmp182__ = 0U; + tmp182__ |= (pSrc->acvo_aifsn << 0); + tmp182__ |= (pSrc->acvo_acm << 4); + tmp182__ |= (pSrc->acvo_aci << 5); + tmp182__ |= (pSrc->unused4 << 7); + *pBuf = tmp182__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp181__ = 0U; - tmp181__ |= (pSrc->acvo_acwmin << 0); - tmp181__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp181__; + tmp183__ = 0U; + tmp183__ |= (pSrc->acvo_acwmin << 0); + tmp183__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp183__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -25909,6 +25992,14 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEWscReassocRes) * i), pBufRemaining, nBufRemaining, &len); break; + case SigIeaddba_extn_element: + status |= + dot11f_pack_ie_addba_extn_element( + pCtx, (tDot11fIEaddba_extn_element *) + (pSrc + pIe->offset + + sizeof(tDot11fIEaddba_extn_element) * i), + pBufRemaining, nBufRemaining, &len); + break; case SigIebss_color_change: status |= dot11f_pack_ie_bss_color_change(