|
@@ -25,7 +25,7 @@
|
|
|
*
|
|
|
*
|
|
|
* This file was automatically generated by 'framesc'
|
|
|
- * Fri Oct 21 13:13:14 2022 from the following file(s):
|
|
|
+ * Mon Oct 31 15:26:23 2022 from the following file(s):
|
|
|
*
|
|
|
* dot11f.frms
|
|
|
*
|
|
@@ -8517,27 +8517,27 @@ uint32_t dot11f_unpack_ie_bss_max_idle_period(tpAniSirGlobal pCtx,
|
|
|
#define SigIebss_max_idle_period (0x0080)
|
|
|
|
|
|
|
|
|
-static const tFFDefn FFS_decriptor_element[] = {
|
|
|
+static const tFFDefn FFS_descriptor_element[] = {
|
|
|
{ NULL, 0, 0, 0,},
|
|
|
};
|
|
|
|
|
|
-static const tIEDefn IES_decriptor_element[] = {
|
|
|
- { offsetof(tDot11fIEdecriptor_element, tclas_mask),
|
|
|
+static const tIEDefn IES_descriptor_element[] = {
|
|
|
+ { offsetof(tDot11fIEdescriptor_element, tclas_mask),
|
|
|
offsetof(tDot11fIEtclas_mask, present), 0, "tclas_mask",
|
|
|
0, 20, 20, SigIetclas_mask, {0, 0, 0, 0, 0},
|
|
|
0, DOT11F_EID_TCLAS_MASK, 89, 0, },
|
|
|
- { offsetof(tDot11fIEdecriptor_element, mscs_status),
|
|
|
+ { offsetof(tDot11fIEdescriptor_element, mscs_status),
|
|
|
offsetof(tDot11fIEmscs_status, present), 0, "mscs_status",
|
|
|
0, 3, 3, SigIemscs_status, {0, 0, 0, 0, 0},
|
|
|
0, DOT11F_EID_MSCS_STATUS, 0, 0, },
|
|
|
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },
|
|
|
};
|
|
|
|
|
|
-uint32_t dot11f_unpack_ie_decriptor_element(tpAniSirGlobal pCtx,
|
|
|
- uint8_t *pBuf,
|
|
|
- uint8_t ielen,
|
|
|
- tDot11fIEdecriptor_element *pDst,
|
|
|
- bool append_ie)
|
|
|
+uint32_t dot11f_unpack_ie_descriptor_element(tpAniSirGlobal pCtx,
|
|
|
+ uint8_t *pBuf,
|
|
|
+ uint8_t ielen,
|
|
|
+ tDot11fIEdescriptor_element *pDst,
|
|
|
+ bool append_ie)
|
|
|
{
|
|
|
uint32_t status = DOT11F_PARSE_SUCCESS;
|
|
|
(void) pBuf; (void)ielen; /* Shutup the compiler */
|
|
@@ -8572,15 +8572,15 @@ uint32_t dot11f_unpack_ie_decriptor_element(tpAniSirGlobal pCtx,
|
|
|
status |= unpack_core(pCtx,
|
|
|
pBuf,
|
|
|
ielen,
|
|
|
- FFS_decriptor_element,
|
|
|
- IES_decriptor_element,
|
|
|
+ FFS_descriptor_element,
|
|
|
+ IES_descriptor_element,
|
|
|
(uint8_t *)pDst,
|
|
|
sizeof(*pDst),
|
|
|
append_ie);
|
|
|
return status;
|
|
|
-} /* End dot11f_unpack_ie_decriptor_element. */
|
|
|
+} /* End dot11f_unpack_ie_descriptor_element. */
|
|
|
|
|
|
-#define SigIedecriptor_element (0x0081)
|
|
|
+#define SigIedescriptor_element (0x0081)
|
|
|
|
|
|
|
|
|
uint32_t dot11f_unpack_ie_dh_parameter_element(tpAniSirGlobal pCtx,
|
|
@@ -14138,10 +14138,10 @@ static const tFFDefn FFS_mscs_request_action_frame[] = {
|
|
|
};
|
|
|
|
|
|
static const tIEDefn IES_mscs_request_action_frame[] = {
|
|
|
- { offsetof(tDot11fmscs_request_action_frame, decriptor_element),
|
|
|
- offsetof(tDot11fIEdecriptor_element, present), 0, "decriptor_element",
|
|
|
- 0, 9, 32, SigIedecriptor_element, {0, 0, 0, 0, 0},
|
|
|
- 0, DOT11F_EID_DECRIPTOR_ELEMENT, 88, 1, },
|
|
|
+ { offsetof(tDot11fmscs_request_action_frame, descriptor_element),
|
|
|
+ offsetof(tDot11fIEdescriptor_element, present), 0, "descriptor_element",
|
|
|
+ 0, 9, 32, SigIedescriptor_element, {0, 0, 0, 0, 0},
|
|
|
+ 0, DOT11F_EID_DESCRIPTOR_ELEMENT, 88, 1, },
|
|
|
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },};
|
|
|
|
|
|
uint32_t dot11f_unpack_mscs_request_action_frame(tpAniSirGlobal pCtx,
|
|
@@ -15855,13 +15855,13 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx,
|
|
|
countOffset),
|
|
|
append_ie);
|
|
|
break;
|
|
|
- case SigIedecriptor_element:
|
|
|
+ case SigIedescriptor_element:
|
|
|
status |=
|
|
|
- dot11f_unpack_ie_decriptor_element(
|
|
|
+ dot11f_unpack_ie_descriptor_element(
|
|
|
pCtx, pBufRemaining, len,
|
|
|
- (tDot11fIEdecriptor_element *)
|
|
|
+ (tDot11fIEdescriptor_element *)
|
|
|
(pFrm + pIe->offset +
|
|
|
- sizeof(tDot11fIEdecriptor_element) *
|
|
|
+ sizeof(tDot11fIEdescriptor_element) *
|
|
|
countOffset),
|
|
|
append_ie);
|
|
|
break;
|
|
@@ -17565,8 +17565,8 @@ uint32_t dot11f_get_packed_ie_wsc_reassoc_res(tpAniSirGlobal pCtx,
|
|
|
return status;
|
|
|
} /* End dot11f_get_packed_ie_wsc_reassoc_res. */
|
|
|
|
|
|
-uint32_t dot11f_get_packed_ie_decriptor_element(tpAniSirGlobal pCtx,
|
|
|
- tDot11fIEdecriptor_element *pIe, uint32_t *pnNeeded)
|
|
|
+uint32_t dot11f_get_packed_ie_descriptor_element(tpAniSirGlobal pCtx,
|
|
|
+ tDot11fIEdescriptor_element *pIe, uint32_t *pnNeeded)
|
|
|
{
|
|
|
uint32_t status = DOT11F_PARSE_SUCCESS;
|
|
|
(void)pCtx;
|
|
@@ -17575,11 +17575,11 @@ uint32_t dot11f_get_packed_ie_decriptor_element(tpAniSirGlobal pCtx,
|
|
|
*pnNeeded += 2;
|
|
|
*pnNeeded += 4;
|
|
|
status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded,
|
|
|
- IES_decriptor_element);
|
|
|
+ IES_descriptor_element);
|
|
|
break;
|
|
|
}
|
|
|
return status;
|
|
|
-} /* End dot11f_get_packed_ie_decriptor_element. */
|
|
|
+} /* End dot11f_get_packed_ie_descriptor_element. */
|
|
|
|
|
|
uint32_t dot11f_get_packed_ie_eht_cap(tpAniSirGlobal pCtx,
|
|
|
tDot11fIEeht_cap *pIe, uint32_t *pnNeeded)
|
|
@@ -19388,11 +19388,11 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx,
|
|
|
(pFrm + pIe->offset + offset * i))->
|
|
|
present;
|
|
|
break;
|
|
|
- case SigIedecriptor_element:
|
|
|
- offset = sizeof(tDot11fIEdecriptor_element);
|
|
|
+ case SigIedescriptor_element:
|
|
|
+ offset = sizeof(tDot11fIEdescriptor_element);
|
|
|
status |=
|
|
|
- dot11f_get_packed_ie_decriptor_element(
|
|
|
- pCtx, (tDot11fIEdecriptor_element *)
|
|
|
+ dot11f_get_packed_ie_descriptor_element(
|
|
|
+ pCtx, (tDot11fIEdescriptor_element *)
|
|
|
(pFrm + pIe->offset + offset * i),
|
|
|
pnNeeded);
|
|
|
break;
|
|
@@ -28181,17 +28181,17 @@ uint32_t dot11f_pack_ie_bss_max_idle_period(tpAniSirGlobal pCtx,
|
|
|
return DOT11F_PARSE_SUCCESS;
|
|
|
} /* End dot11f_pack_ie_bss_max_idle_period. */
|
|
|
|
|
|
-uint32_t dot11f_pack_ie_decriptor_element(tpAniSirGlobal pCtx,
|
|
|
- tDot11fIEdecriptor_element *pSrc,
|
|
|
- uint8_t *pBuf,
|
|
|
- uint32_t nBuf,
|
|
|
- uint32_t *pnConsumed)
|
|
|
+uint32_t dot11f_pack_ie_descriptor_element(tpAniSirGlobal pCtx,
|
|
|
+ tDot11fIEdescriptor_element *pSrc,
|
|
|
+ uint8_t *pBuf,
|
|
|
+ uint32_t nBuf,
|
|
|
+ uint32_t *pnConsumed)
|
|
|
{
|
|
|
uint8_t *pIeLen = 0;
|
|
|
uint32_t nConsumedOnEntry = *pnConsumed;
|
|
|
uint32_t nNeeded = 0U;
|
|
|
uint32_t status = DOT11F_PARSE_SUCCESS;
|
|
|
- status = dot11f_get_packed_ie_decriptor_element(pCtx, pSrc, &nNeeded);
|
|
|
+ status = dot11f_get_packed_ie_descriptor_element(pCtx, pSrc, &nNeeded);
|
|
|
if (!DOT11F_SUCCEEDED(status))
|
|
|
return status;
|
|
|
while (pSrc->present) {
|
|
@@ -28217,8 +28217,8 @@ uint32_t dot11f_pack_ie_decriptor_element(tpAniSirGlobal pCtx,
|
|
|
pBuf,
|
|
|
nBuf,
|
|
|
pnConsumed,
|
|
|
- FFS_decriptor_element,
|
|
|
- IES_decriptor_element);
|
|
|
+ FFS_descriptor_element,
|
|
|
+ IES_descriptor_element);
|
|
|
break;
|
|
|
}
|
|
|
(void)pCtx;
|
|
@@ -28226,7 +28226,7 @@ uint32_t dot11f_pack_ie_decriptor_element(tpAniSirGlobal pCtx,
|
|
|
*pIeLen = *pnConsumed - nConsumedOnEntry - 2;
|
|
|
}
|
|
|
return status;
|
|
|
-} /* End dot11f_pack_ie_decriptor_element. */
|
|
|
+} /* End dot11f_pack_ie_descriptor_element. */
|
|
|
|
|
|
uint32_t dot11f_pack_ie_dh_parameter_element(tpAniSirGlobal pCtx,
|
|
|
tDot11fIEdh_parameter_element *pSrc,
|
|
@@ -32299,12 +32299,12 @@ static uint32_t pack_core(tpAniSirGlobal pCtx,
|
|
|
sizeof(tDot11fIEbss_max_idle_period) * i),
|
|
|
pBufRemaining, nBufRemaining, &len);
|
|
|
break;
|
|
|
- case SigIedecriptor_element:
|
|
|
+ case SigIedescriptor_element:
|
|
|
status |=
|
|
|
- dot11f_pack_ie_decriptor_element(
|
|
|
- pCtx, (tDot11fIEdecriptor_element *)
|
|
|
+ dot11f_pack_ie_descriptor_element(
|
|
|
+ pCtx, (tDot11fIEdescriptor_element *)
|
|
|
(pSrc + pIe->offset +
|
|
|
- sizeof(tDot11fIEdecriptor_element) * i),
|
|
|
+ sizeof(tDot11fIEdescriptor_element) * i),
|
|
|
pBufRemaining, nBufRemaining, &len);
|
|
|
break;
|
|
|
case SigIedh_parameter_element:
|