qcacld-3.0: Don't process duplicate WMM/WME IEs
After parsing initial WMM params (say with version 1) if driver gets another WMM param with same IE present of qbss params (say with version 2), the driver rejects the entire IE. This results driver does not send WMM/WME IEs in assoc request as per expected value. Fix is to make sure driver should not process duplicate WMM/WME IEs. Change-Id: Ieb218af18709b0632b91c8d66560690667bfb8fa CRs-Fixed: 2415298
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*
|
||||
* This file was automatically generated by 'framesc'
|
||||
* Tue Feb 5 16:01:26 2019 from the following file(s):
|
||||
* Mon Mar 25 14:48:07 2019 from the following file(s):
|
||||
*
|
||||
* dot11f.frms
|
||||
*
|
||||
|
@@ -24,7 +24,7 @@
|
||||
*
|
||||
*
|
||||
* This file was automatically generated by 'framesc'
|
||||
* Tue Feb 5 16:01:26 2019 from the following file(s):
|
||||
* Mon Mar 25 14:48:07 2019 from the following file(s):
|
||||
*
|
||||
* dot11f.frms
|
||||
*
|
||||
@@ -1707,7 +1707,7 @@ uint32_t dot11f_unpack_ie_gtk(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp12__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -1758,7 +1758,7 @@ uint32_t dot11f_unpack_ie_igtk(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -1806,7 +1806,7 @@ uint32_t dot11f_unpack_ie_r0_kh_id(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_PMK_R0_ID = (uint8_t)(ielen);
|
||||
if (ielen > 48) {
|
||||
@@ -1831,7 +1831,7 @@ uint32_t dot11f_unpack_ie_r1_kh_id(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 6)) {
|
||||
pDst->present = 0;
|
||||
@@ -1855,7 +1855,7 @@ uint32_t dot11f_unpack_ie_ap_channel_report(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -1888,7 +1888,7 @@ uint32_t dot11f_unpack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -1912,7 +1912,7 @@ uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_reportedFields = (uint8_t)(ielen);
|
||||
if (ielen > 224) {
|
||||
@@ -1937,7 +1937,7 @@ uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -1969,7 +1969,7 @@ uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -1993,7 +1993,7 @@ uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2021,7 +2021,7 @@ uint32_t dot11f_unpack_ie_multi_bssid(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2049,7 +2049,7 @@ uint32_t dot11f_unpack_ie_ric_data(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2089,7 +2089,7 @@ uint32_t dot11f_unpack_ie_ric_descriptor(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2122,7 +2122,7 @@ uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp17__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2209,7 +2209,7 @@ uint32_t dot11f_unpack_ie_requested_info(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_requested_eids = (uint8_t)(ielen);
|
||||
DOT11F_MEMCPY(pCtx, pDst->requested_eids, pBuf, (ielen));
|
||||
@@ -2257,7 +2257,7 @@ uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp18__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -2317,7 +2317,7 @@ uint32_t dot11f_unpack_ie_tclas(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2512,7 +2512,7 @@ uint32_t dot11f_unpack_ie_ts_delay(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 4)) {
|
||||
pDst->present = 0;
|
||||
@@ -2536,7 +2536,7 @@ uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -2571,7 +2571,7 @@ uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp21__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -2738,7 +2738,7 @@ uint32_t dot11f_unpack_ie_vht_caps(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp24__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 4)) {
|
||||
pDst->present = 0;
|
||||
@@ -2818,7 +2818,7 @@ uint32_t dot11f_unpack_ie_vht_operation(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2867,7 +2867,7 @@ uint32_t dot11f_unpack_ie_wmm_schedule(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp25__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -2939,7 +2939,7 @@ uint32_t dot11f_unpack_ie_wmmtclas(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3143,7 +3143,7 @@ uint32_t dot11f_unpack_ie_wmmtclasproc(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3179,7 +3179,7 @@ uint32_t dot11f_unpack_ie_wmmts_delay(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3218,7 +3218,7 @@ uint32_t dot11f_unpack_ie_wmmtspec(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp28__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3394,7 +3394,7 @@ uint32_t dot11f_unpack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3434,7 +3434,7 @@ uint32_t dot11f_unpack_ie_azimuth_req(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3459,7 +3459,7 @@ uint32_t dot11f_unpack_ie_beacon_report_frm_body_fragment_id(tpAniSirGlobal pCtx
|
||||
uint16_t tmp29__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -3486,7 +3486,7 @@ uint32_t dot11f_unpack_ie_last_beacon_report_indication(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3510,7 +3510,7 @@ uint32_t dot11f_unpack_ie_max_age(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -3563,7 +3563,7 @@ uint32_t dot11f_unpack_ie_neighbor_rpt(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp31__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 6)) {
|
||||
pDst->present = 0;
|
||||
@@ -3656,7 +3656,7 @@ uint32_t dot11f_unpack_ie_req_mac_addr(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 6)) {
|
||||
pDst->present = 0;
|
||||
@@ -3680,7 +3680,7 @@ uint32_t dot11f_unpack_ie_tgt_mac_addr(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 6)) {
|
||||
pDst->present = 0;
|
||||
@@ -3704,7 +3704,7 @@ uint32_t dot11f_unpack_ie_vht_transmit_power_env(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_bytes = (uint8_t)(ielen);
|
||||
if (ielen > 5) {
|
||||
@@ -3729,7 +3729,7 @@ uint32_t dot11f_unpack_ie_aid(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -3753,7 +3753,7 @@ uint32_t dot11f_unpack_ie_cf_params(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3801,7 +3801,7 @@ uint32_t dot11f_unpack_ie_challenge_text(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_text = (uint8_t)(ielen);
|
||||
if (ielen > 253) {
|
||||
@@ -3826,7 +3826,7 @@ uint32_t dot11f_unpack_ie_chan_switch_ann(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -3882,7 +3882,7 @@ uint32_t dot11f_unpack_ie_channel_switch_wrapper(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
(void)pCtx;
|
||||
status |= unpack_core(pCtx,
|
||||
@@ -3908,7 +3908,7 @@ uint32_t dot11f_unpack_ie_country(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 3)) {
|
||||
pDst->present = 0;
|
||||
@@ -3957,7 +3957,7 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp39__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4110,7 +4110,7 @@ uint32_t dot11f_unpack_ie_erp_info(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp40__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4138,7 +4138,7 @@ uint32_t dot11f_unpack_ie_ese_cckm_opaque(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
if (ielen > 20) {
|
||||
@@ -4164,7 +4164,7 @@ uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp41__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4198,7 +4198,7 @@ uint32_t dot11f_unpack_ie_ese_traf_strm_met(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4238,7 +4238,7 @@ uint32_t dot11f_unpack_ie_ese_traf_strm_rate_set(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4271,7 +4271,7 @@ uint32_t dot11f_unpack_ie_ese_txmit_power(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4303,7 +4303,7 @@ uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4317,7 +4317,6 @@ uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx,
|
||||
|
||||
#define SigIeESEVersion (0x0035)
|
||||
|
||||
|
||||
uint32_t dot11f_unpack_ie_ext_cap(tpAniSirGlobal pCtx,
|
||||
uint8_t *pBuf,
|
||||
uint8_t ielen,
|
||||
@@ -4327,7 +4326,7 @@ uint32_t dot11f_unpack_ie_ext_cap(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
|
||||
if (!ielen) /* Check to ensure copying of ielen bytes */
|
||||
@@ -4359,7 +4358,7 @@ uint32_t dot11f_unpack_ie_ext_supp_rates(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
for (i = 0; i < ielen; i++) {
|
||||
if ((DOT11F_IS_BG_RATE(pBuf[i] & 0x7F)) &&
|
||||
@@ -4390,7 +4389,7 @@ uint32_t dot11f_unpack_ie_fh_param_set(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -4438,7 +4437,7 @@ uint32_t dot11f_unpack_ie_fh_params(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4470,7 +4469,7 @@ uint32_t dot11f_unpack_ie_fh_patt_table(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4547,7 +4546,7 @@ uint32_t dot11f_unpack_ie_ft_info(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp42__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -4612,7 +4611,7 @@ uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp47__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -4734,7 +4733,7 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp50__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -4816,7 +4815,7 @@ uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -4840,7 +4839,7 @@ uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 6)) {
|
||||
pDst->present = 0;
|
||||
@@ -4971,7 +4970,7 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp53__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -5355,7 +5354,7 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp54__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -5583,7 +5582,7 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp55__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -5647,7 +5646,7 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp57__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 6)) {
|
||||
pDst->present = 0;
|
||||
@@ -5740,7 +5739,7 @@ uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -5813,7 +5812,7 @@ uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp58__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6028,7 +6027,7 @@ uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
if (ielen > 249) {
|
||||
@@ -6131,7 +6130,7 @@ uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6164,7 +6163,7 @@ uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp59__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6193,7 +6192,7 @@ uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6225,7 +6224,7 @@ uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6249,7 +6248,7 @@ uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -6289,7 +6288,7 @@ uint32_t dot11f_unpack_ie_QCN_IE(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 4)) {
|
||||
pDst->present = 0;
|
||||
@@ -6313,7 +6312,7 @@ uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6346,7 +6345,7 @@ uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp60__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6376,7 +6375,7 @@ uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp61__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6407,7 +6406,7 @@ uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_dscp_exceptions = (uint8_t)(ielen);
|
||||
if (ielen > 60) {
|
||||
@@ -6432,7 +6431,7 @@ uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6480,7 +6479,7 @@ uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6554,7 +6553,7 @@ uint32_t dot11f_unpack_ie_ric_data_desc(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
(void)pCtx;
|
||||
status |= unpack_core(pCtx,
|
||||
@@ -6583,7 +6582,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx,
|
||||
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -6756,7 +6755,7 @@ uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6780,7 +6779,7 @@ uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
if (ielen > 253) {
|
||||
@@ -6805,7 +6804,7 @@ uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_bands = (uint8_t)(ielen / 2);
|
||||
if (ielen > 48 * 2) {
|
||||
@@ -6830,7 +6829,7 @@ uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_classes = (uint8_t)(ielen);
|
||||
if (ielen > 32) {
|
||||
@@ -6857,7 +6856,7 @@ uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
for (i = 0; i < ielen; i++) {
|
||||
if ((DOT11F_IS_BG_RATE(pBuf[i] & 0x7F)) &&
|
||||
@@ -6888,7 +6887,7 @@ uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6937,7 +6936,7 @@ uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -6969,7 +6968,7 @@ uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
(void)pCtx;
|
||||
return status;
|
||||
@@ -6987,7 +6986,7 @@ uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7027,7 +7026,7 @@ uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7059,7 +7058,7 @@ uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7115,7 +7114,7 @@ uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
(void)pCtx;
|
||||
return status;
|
||||
@@ -7133,7 +7132,7 @@ uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
(void)pCtx;
|
||||
return status;
|
||||
@@ -7152,7 +7151,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp62__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -7266,7 +7265,7 @@ uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
if (ielen > 253) {
|
||||
@@ -7291,7 +7290,7 @@ uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7323,7 +7322,7 @@ uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
if (ielen > 249) {
|
||||
@@ -7349,7 +7348,7 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp63__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7391,7 +7390,7 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp64__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7427,7 +7426,7 @@ uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp65__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7474,7 +7473,7 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp73__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -7638,7 +7637,7 @@ uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -7747,7 +7746,7 @@ uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
if (ielen > 249) {
|
||||
@@ -8058,7 +8057,7 @@ uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
if (ielen > 249) {
|
||||
@@ -8267,7 +8266,7 @@ uint32_t dot11f_unpack_ie_addba_extn_element(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp74__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -8295,7 +8294,7 @@ uint32_t dot11f_unpack_ie_bss_color_change(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp75__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -8329,7 +8328,7 @@ uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -8454,7 +8453,7 @@ uint32_t dot11f_unpack_ie_fils_hlp_container(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 6)) {
|
||||
pDst->present = 0;
|
||||
@@ -8491,7 +8490,7 @@ uint32_t dot11f_unpack_ie_fils_indication(tpAniSirGlobal pCtx,
|
||||
uint16_t tmp76__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 2)) {
|
||||
pDst->present = 0;
|
||||
@@ -8528,7 +8527,7 @@ uint32_t dot11f_unpack_ie_fils_kde(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 8)) {
|
||||
pDst->present = 0;
|
||||
@@ -8556,7 +8555,7 @@ uint32_t dot11f_unpack_ie_fils_key_confirmation(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_key_auth = (uint8_t)(ielen);
|
||||
DOT11F_MEMCPY(pCtx, pDst->key_auth, pBuf, (ielen));
|
||||
@@ -8576,7 +8575,7 @@ uint32_t dot11f_unpack_ie_fils_nonce(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 16)) {
|
||||
pDst->present = 0;
|
||||
@@ -8600,7 +8599,7 @@ uint32_t dot11f_unpack_ie_fils_public_key(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -8628,7 +8627,7 @@ uint32_t dot11f_unpack_ie_fils_session(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 8)) {
|
||||
pDst->present = 0;
|
||||
@@ -8652,7 +8651,7 @@ uint32_t dot11f_unpack_ie_fils_wrapped_data(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_wrapped_data = (uint8_t)(ielen);
|
||||
DOT11F_MEMCPY(pCtx, pDst->wrapped_data, pBuf, (ielen));
|
||||
@@ -8672,7 +8671,7 @@ uint32_t dot11f_unpack_ie_fragment_ie(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
DOT11F_MEMCPY(pCtx, pDst->data, pBuf, (ielen));
|
||||
@@ -9041,7 +9040,7 @@ uint32_t dot11f_unpack_ie_hs20vendor_ie(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp85__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -9098,7 +9097,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx,
|
||||
uint8_t tmp86__;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -9128,7 +9127,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -9313,7 +9312,7 @@ uint32_t dot11f_unpack_ie_osen_ie(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
pDst->num_data = (uint8_t)(ielen);
|
||||
DOT11F_MEMCPY(pCtx, pDst->data, pBuf, (ielen));
|
||||
@@ -9353,7 +9352,7 @@ uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
@@ -9392,7 +9391,7 @@ uint32_t dot11f_unpack_ie_vendor_vht_ie(tpAniSirGlobal pCtx,
|
||||
uint32_t status = DOT11F_PARSE_SUCCESS;
|
||||
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
||||
if (pDst->present)
|
||||
status = DOT11F_DUPLICATE_IE;
|
||||
return DOT11F_DUPLICATE_IE;
|
||||
pDst->present = 1;
|
||||
if (unlikely(ielen < 1)) {
|
||||
pDst->present = 0;
|
||||
|
Reference in New Issue
Block a user