Browse Source

qcacld-3.0: Correct bad misspellings in dot11f files

Correct bad misspelling of IE decriptor_element to
descriptor_element in frame parser file and subsequently
dot11f source and header files and the parser API file.

Change-Id: I0aedb44ffdb9a407721bfe5f30ce23cd40efcbf1
CRs-Fixed: 3314908
Gururaj Pandurangi 2 years ago
parent
commit
e16b22a430

+ 2 - 2
core/mac/src/cfg/cfgUtil/dot11f.frms

@@ -3052,7 +3052,7 @@ IE mscs_status (EID_MSCS_STATUS)
      status_code,        1;
 }
 
-IE decriptor_element (EID_EXTN_ID_ELEMENT) OUI (0x58)
+IE descriptor_element (EID_EXTN_ID_ELEMENT) OUI (0x58)
 {
      request_type,                1;
      user_priority_control,       2;
@@ -4874,7 +4874,7 @@ FRAME mscs_request_action_frame
     FF     Category;
     FF     Action;
     FF     DialogToken;
-    MANDIE decriptor_element;
+    MANDIE descriptor_element;
 }
 
 // Local Variables:

+ 16 - 16
core/mac/src/include/dot11f.h

@@ -27,7 +27,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
  *
@@ -8693,42 +8693,42 @@ uint32_t dot11f_get_packed_ie_bss_max_idle_period(
 #endif /* C++ */
 
 /* EID 255 (0xff) Extended EID 88 (0x58) */
-typedef struct sDot11fIEdecriptor_element {
+typedef struct sDot11fIEdescriptor_element {
 	uint8_t                     present;
 	uint8_t                     request_type;
 	uint16_t                    user_priority_control;
 	uint32_t                    stream_timeout;
 	tDot11fIEtclas_mask         tclas_mask;
 	tDot11fIEmscs_status        mscs_status;
-} tDot11fIEdecriptor_element;
+} tDot11fIEdescriptor_element;
 
-#define DOT11F_EID_DECRIPTOR_ELEMENT (255)
+#define DOT11F_EID_DESCRIPTOR_ELEMENT (255)
 
 /* N.B. These #defines do *not* include the EID & length */
-#define DOT11F_IE_DECRIPTOR_ELEMENT_MIN_LEN (7)
+#define DOT11F_IE_DESCRIPTOR_ELEMENT_MIN_LEN (7)
 
-#define DOT11F_IE_DECRIPTOR_ELEMENT_MAX_LEN (30)
+#define DOT11F_IE_DESCRIPTOR_ELEMENT_MAX_LEN (30)
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* C++ */
-__must_check uint32_t dot11f_unpack_ie_decriptor_element(
+__must_check uint32_t dot11f_unpack_ie_descriptor_element(
 	tpAniSirGlobal,
 	uint8_t *,
 	uint8_t,
-	tDot11fIEdecriptor_element*,
+	tDot11fIEdescriptor_element*,
 	bool);
 
-uint32_t dot11f_pack_ie_decriptor_element(
+uint32_t dot11f_pack_ie_descriptor_element(
 	tpAniSirGlobal,
-	tDot11fIEdecriptor_element *,
+	tDot11fIEdescriptor_element *,
 	uint8_t *,
 	uint32_t,
 	uint32_t*);
 
-uint32_t dot11f_get_packed_ie_decriptor_element(
+uint32_t dot11f_get_packed_ie_descriptor_element(
 	tpAniSirGlobal,
-	tDot11fIEdecriptor_element *,
+	tDot11fIEdescriptor_element *,
 	uint32_t*);
 
 #ifdef __cplusplus
@@ -12404,10 +12404,10 @@ uint32_t dot11f_get_packed_ht2040_bss_coexistence_mgmt_action_frameSize(tpAniSir
 #endif /* C++ */
 
 typedef struct sDot11fmscs_request_action_frame{
-	tDot11fFfCategory                 Category;
-	tDot11fFfAction                   Action;
-	tDot11fFfDialogToken              DialogToken;
-	tDot11fIEdecriptor_element        decriptor_element;
+	tDot11fFfCategory                  Category;
+	tDot11fFfAction                    Action;
+	tDot11fFfDialogToken               DialogToken;
+	tDot11fIEdescriptor_element        descriptor_element;
 } tDot11fmscs_request_action_frame;
 
 #define DOT11F_MSCS_REQUEST_ACTION_FRAME (51)

+ 43 - 43
core/mac/src/sys/legacy/src/utils/src/dot11f.c

@@ -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:

+ 8 - 8
core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -5953,21 +5953,21 @@ void
 populate_dot11f_mscs_dec_element(struct mscs_req_info *mscs_req,
 				 tDot11fmscs_request_action_frame *dot11f)
 {
-	dot11f->decriptor_element.request_type =
+	dot11f->descriptor_element.request_type =
 			mscs_req->dec.request_type;
-	dot11f->decriptor_element.user_priority_control =
+	dot11f->descriptor_element.user_priority_control =
 			mscs_req->dec.user_priority_control;
-	dot11f->decriptor_element.stream_timeout =
+	dot11f->descriptor_element.stream_timeout =
 			mscs_req->dec.stream_timeout;
-	dot11f->decriptor_element.tclas_mask.classifier_type =
+	dot11f->descriptor_element.tclas_mask.classifier_type =
 			mscs_req->dec.tclas_mask.classifier_type;
-	dot11f->decriptor_element.tclas_mask.classifier_mask =
+	dot11f->descriptor_element.tclas_mask.classifier_mask =
 			mscs_req->dec.tclas_mask.classifier_mask;
 
-	dot11f->decriptor_element.present = 1;
-	dot11f->decriptor_element.tclas_mask.present = 1;
+	dot11f->descriptor_element.present = 1;
+	dot11f->descriptor_element.tclas_mask.present = 1;
 
-} /* End populate_dot11f_decriptor_element */
+} /* End populate_dot11f_descriptor_element */
 #endif
 
 void populate_dot11f_wmmtspec(struct mac_tspec_ie *pOld,