qcacld-3.0: Update RNR IE as per 11be D1.4 specification

Update RNR IE fields as per 11be D1.4 specification.

Change-Id: I24d1ef87c247bbe0f2a1d7ea40880a8ca314d5dd
CRs-Fixed: 3157053

core/mac/src/cfg/cfgUtil/dot11f.frms

@@ -2505,16 +2505,6 @@ IE reduced_neighbor_report (EID_RNR_IE)
 		tbtt_offset, 1;
 		bss_params, 1;
 	}
-	tbtt_info_4 (tbtt_info_len IS 4)
-	{
-		tbtt_offset, 1;
-		{
-		     mld_id:                    8;
-		     link_id:                   4;
-		     bss_param_change_cnt:      8;
-		     reserved:                  12;
-		}
-	}
 	tbtt_info_5 (tbtt_info_len IS 5)
 	{
 		tbtt_offset, 1;
@@ -2544,17 +2534,6 @@ IE reduced_neighbor_report (EID_RNR_IE)
 		bss_params, 1;
 		psd_20mhz, 1;
 	}
-	tbtt_info_10 (tbtt_info_len IS 10)
-	{
-		tbtt_offset, 1;
-		bssid[6];
-		{
-		     mld_id:                    8;
-		     link_id:                   4;
-		     bss_param_change_cnt:      8;
-		     reserved:                  12;
-		}
-	}
 	tbtt_info_11 (tbtt_info_len IS 11)
 	{
 		tbtt_offset, 1;

core/mac/src/include/dot11f.h

@@ -27,7 +27,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Fri Apr  1 15:39:36 2022 from the following file(s):
+ * Thu Apr  7 11:06:38 2022 from the following file(s):
  *
  * dot11f.frms
  *
@@ -10255,13 +10255,6 @@ typedef struct sDot11fIEreduced_neighbor_report {
 			uint8_t tbtt_offset;
 			uint8_t bss_params;
 		} tbtt_info_2; /* tbtt_info_len = 2 */
-		struct {
-			uint8_t tbtt_offset;
-			uint32_t                mld_id:8;
-			uint32_t               link_id:4;
-			uint32_t  bss_param_change_cnt:8;
-			uint32_t              reserved:12;
-		} tbtt_info_4; /* tbtt_info_len = 4 */
 		struct {
 			uint8_t tbtt_offset;
 			uint32_t short_ssid;
@@ -10286,14 +10279,6 @@ typedef struct sDot11fIEreduced_neighbor_report {
 			uint8_t bss_params;
 			uint8_t psd_20mhz;
 		} tbtt_info_9; /* tbtt_info_len = 9 */
-		struct {
-			uint8_t tbtt_offset;
-			uint8_t bssid[6];
-			uint32_t                mld_id:8;
-			uint32_t               link_id:4;
-			uint32_t  bss_param_change_cnt:8;
-			uint32_t              reserved:12;
-		} tbtt_info_10; /* tbtt_info_len = 10 */
 		struct {
 			uint8_t tbtt_offset;
 			uint8_t bssid[6];

core/mac/src/include/parser_api.h

@@ -1387,7 +1387,7 @@ void populate_dot11f_mlo_rnr(struct mac_context *mac_ctx,
 			     tDot11fIEreduced_neighbor_report *dot11f);
 
 /**
- * populate_dot11f_rnr_tbtt_info_10() - populate rnr with tbtt_info length 10
+ * populate_dot11f_rnr_tbtt_info_16() - populate rnr with tbtt_info length 16
  * @mac_ctx: pointer to mac_context
  * @pe_session: pe session
  * @rnr_session: session to populate in rnr ie
@@ -1395,7 +1395,7 @@ void populate_dot11f_mlo_rnr(struct mac_context *mac_ctx,
  *
  * Return: void
  */
-void populate_dot11f_rnr_tbtt_info_10(struct mac_context *mac_ctx,
+void populate_dot11f_rnr_tbtt_info_16(struct mac_context *mac_ctx,
 				      struct pe_session *pe_session,
 				      struct pe_session *rnr_session,
 				      tDot11fIEreduced_neighbor_report *dot11f);
@@ -1425,7 +1425,7 @@ static inline void populate_dot11f_mlo_rnr(
 {
 }
 
-static inline void populate_dot11f_rnr_tbtt_info_10(
+static inline void populate_dot11f_rnr_tbtt_info_16(
 			struct mac_context *mac_ctx,
 			struct pe_session *pe_session,
 			struct pe_session *rnr_session,

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -8988,12 +8988,12 @@ void populate_dot11f_mlo_rnr(struct mac_context *mac_ctx,
 			continue;
 		}
 		if (!rnr_populated) {
-			populate_dot11f_rnr_tbtt_info_10(mac_ctx, session,
+			populate_dot11f_rnr_tbtt_info_16(mac_ctx, session,
 							 link_session, dot11f);
 			pe_debug("mlo vdev id %d populate vdev id %d link id %d op class %d chan num %d in RNR IE",
 				 wlan_vdev_get_id(session->vdev),
 				 wlan_vdev_get_id(wlan_vdev_list[link]),
-				 dot11f->tbtt_info.tbtt_info_10.link_id,
+				 dot11f->tbtt_info.tbtt_info_16.link_id,
 				 dot11f->op_class, dot11f->channel_num);
 			rnr_populated = true;
 		}
@@ -9001,7 +9001,7 @@ void populate_dot11f_mlo_rnr(struct mac_context *mac_ctx,
 	}
 }
 
-void populate_dot11f_rnr_tbtt_info_10(struct mac_context *mac_ctx,
+void populate_dot11f_rnr_tbtt_info_16(struct mac_context *mac_ctx,
 				      struct pe_session *pe_session,
 				      struct pe_session *rnr_session,
 				      tDot11fIEreduced_neighbor_report *dot11f)
@@ -9036,13 +9036,13 @@ void populate_dot11f_rnr_tbtt_info_10(struct mac_context *mac_ctx,
 	dot11f->channel_num = wlan_reg_freq_to_chan(mac_ctx->pdev,
 						    rnr_session->curr_op_freq);
 	dot11f->tbtt_info_count = 0;
-	dot11f->tbtt_info_len = 10;
-	qdf_mem_copy(dot11f->tbtt_info.tbtt_info_10.bssid,
+	dot11f->tbtt_info_len = 16;
+	qdf_mem_copy(dot11f->tbtt_info.tbtt_info_16.bssid,
 		     rnr_session->self_mac_addr, sizeof(tSirMacAddr));
-	dot11f->tbtt_info.tbtt_info_10.mld_id = 0;
-	dot11f->tbtt_info.tbtt_info_10.link_id = wlan_vdev_get_link_id(
+	dot11f->tbtt_info.tbtt_info_16.mld_id = 0;
+	dot11f->tbtt_info.tbtt_info_16.link_id = wlan_vdev_get_link_id(
 							rnr_session->vdev);
-	dot11f->tbtt_info.tbtt_info_10.bss_param_change_cnt =
+	dot11f->tbtt_info.tbtt_info_16.bss_param_change_cnt =
 		rnr_session->mlo_link_info.link_ie.bss_param_change_cnt;
 }