Эх сурвалжийг харах

qcacld-3.0: Update dot11f pack/unpack APIs for MLO IE

Update dot11f pack/unpack APIs for MLO IE and sta profile
subelement. Initially these APIs had break statements under
else condition for optional fields that prevented pack core
API being invoked for sta profile. The parser generator tool
code is modified to remove else condition for such optional
fields for the MLO IE.

Change-Id: Ieb9ff2ec7da5d4e6056aa4db80240aa847366882
CRs-Fixed: 2996635
Gururaj Pandurangi 3 жил өмнө
parent
commit
a66aaefc3e

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

@@ -26,7 +26,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Wed Jul 14 02:14:16 2021 from the following file(s):
+ * Sat Jul 17 04:25:45 2021 from the following file(s):
  *
  * dot11f.frms
  *

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

@@ -24,7 +24,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Wed Jul 14 02:14:16 2021 from the following file(s):
+ * Sat Jul 17 04:25:45 2021 from the following file(s):
  *
  * dot11f.frms
  *
@@ -17354,8 +17354,6 @@ uint32_t dot11f_get_packed_ie_sta_profile(tpAniSirGlobal pCtx,
 				*pnNeeded += 6;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->beacon_interval_present) {
 			switch (pIe->beacon_interval_present) {
@@ -17363,8 +17361,6 @@ uint32_t dot11f_get_packed_ie_sta_profile(tpAniSirGlobal pCtx,
 				*pnNeeded += 2;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->dtim_info_present) {
 			switch (pIe->dtim_info_present) {
@@ -17373,8 +17369,6 @@ uint32_t dot11f_get_packed_ie_sta_profile(tpAniSirGlobal pCtx,
 				*pnNeeded += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->nstr_link_pair_present) {
 			switch (pIe->nstr_link_pair_present) {
@@ -17382,8 +17376,6 @@ uint32_t dot11f_get_packed_ie_sta_profile(tpAniSirGlobal pCtx,
 				*pnNeeded += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded,
 				IES_sta_profile);
@@ -17883,8 +17875,6 @@ uint32_t dot11f_get_packed_ie_mlo_ie(tpAniSirGlobal pCtx,
 				*pnNeeded += 6;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->link_id_info_present) {
 			switch (pIe->link_id_info_present) {
@@ -17892,8 +17882,6 @@ uint32_t dot11f_get_packed_ie_mlo_ie(tpAniSirGlobal pCtx,
 				*pnNeeded += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->bss_param_change_cnt_present) {
 			switch (pIe->bss_param_change_cnt_present) {
@@ -17901,8 +17889,6 @@ uint32_t dot11f_get_packed_ie_mlo_ie(tpAniSirGlobal pCtx,
 				*pnNeeded += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->medium_sync_delay_info_present) {
 			switch (pIe->medium_sync_delay_info_present) {
@@ -17910,8 +17896,6 @@ uint32_t dot11f_get_packed_ie_mlo_ie(tpAniSirGlobal pCtx,
 				*pnNeeded += 2;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->eml_capab_present) {
 			switch (pIe->eml_capab_present) {
@@ -17920,8 +17904,6 @@ uint32_t dot11f_get_packed_ie_mlo_ie(tpAniSirGlobal pCtx,
 				*pnNeeded += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pIe->mld_capab_present) {
 			switch (pIe->mld_capab_present) {
@@ -17929,8 +17911,6 @@ uint32_t dot11f_get_packed_ie_mlo_ie(tpAniSirGlobal pCtx,
 				*pnNeeded += 2;
 				break;
 			}
-		} else {
-			break;
 		}
 		status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded,
 				IES_mlo_ie);
@@ -25842,8 +25822,6 @@ uint32_t dot11f_pack_ie_sta_profile(tpAniSirGlobal pCtx,
 				pBuf += 6;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->beacon_interval_present) {
 			switch (pSrc->beacon_interval_present) {
@@ -25853,8 +25831,6 @@ uint32_t dot11f_pack_ie_sta_profile(tpAniSirGlobal pCtx,
 				pBuf += 2;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->dtim_info_present) {
 			switch (pSrc->dtim_info_present) {
@@ -25867,8 +25843,6 @@ uint32_t dot11f_pack_ie_sta_profile(tpAniSirGlobal pCtx,
 				pBuf += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->nstr_link_pair_present) {
 			switch (pSrc->nstr_link_pair_present) {
@@ -25878,8 +25852,6 @@ uint32_t dot11f_pack_ie_sta_profile(tpAniSirGlobal pCtx,
 				pBuf += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		status = pack_core(pCtx,
 				(uint8_t *)pSrc,
@@ -29785,8 +29757,6 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 				pBuf += 6;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->link_id_info_present) {
 			switch (pSrc->link_id_info_present) {
@@ -29803,8 +29773,6 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 				nBuf -=  1 ;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->bss_param_change_cnt_present) {
 			switch (pSrc->bss_param_change_cnt_present) {
@@ -29814,8 +29782,6 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 				pBuf += 1;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->medium_sync_delay_info_present) {
 			switch (pSrc->medium_sync_delay_info_present) {
@@ -29833,8 +29799,6 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 				nBuf -=  2 ;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->eml_capab_present) {
 			switch (pSrc->eml_capab_present) {
@@ -29865,8 +29829,6 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 				nBuf -=  1 ;
 				break;
 			}
-		} else {
-			break;
 		}
 		if (pSrc->mld_capab_present) {
 			switch (pSrc->mld_capab_present) {
@@ -29886,8 +29848,6 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 				nBuf -=  2 ;
 				break;
 			}
-		} else {
-			break;
 		}
 		status = pack_core(pCtx,
 				(uint8_t *)pSrc,