qcacld-3.0: Add support to process channel load rrm frame

Add support to process channel load request and response
rrm frame.

Measurement Request field format for Channel Load request:
1. Operating Class --> 1 bytes
2. Channel Number --> 1 bytes
3. Randomization Interval --> 2 bytes
4. Measurement Duration --> 2 bytes
5. Optional Subelements --> variable length

Optional subelement IDs for Channel Load request:
1. Channel Load Reporting (ID = 1)

Measurement Report field format for Channel Load report:
Operating Class --> 1 bytes
Channel Number  --> 1 bytes
Actual Measurement Start Time --> 8 bytes
Measurement Duration --> 2 bytes
Channel Load  --> 1 bytes

Change-Id: I692040266e4294f58e492dac6f32002461c0efd3
CRs-Fixed: 3580157

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

@@ -1730,6 +1730,14 @@ IE MeasurementReport (EID_MEAS_REPORT)    // 7.3.2.22
             rpi6_density,    1;
             rpi7_density,    1;
         }
+        channel_load_report (type IS 3)
+        {
+            op_class,          1;
+            channel,           1;
+            meas_start_time,   8;
+            meas_duration,     2;
+            chan_load,         1;
+        }
        Beacon (type IS 5)
        {
            regClass,               1;
@@ -2975,7 +2983,7 @@ IE dh_parameter_element (EID_EXTN_ID_ELEMENT) OUI ( 0x20 )
     public_key[0..255];
 }
 
-const EID_RRM_BEACON_REPORTING     = 1;
+const EID_RRM_REPORTING     = 1;
 const EID_RRM_BCN_REPORTING_DETAIL = 2;
 
 const SUB_EID_AZIMUTH_REQ = 1;
@@ -2985,10 +2993,10 @@ const SUB_EID_MAX_AGE = 4;
 const SUB_EID_NEIGHBOR_RPT = 52;
 //const SUB_EID_TRIGGERED_REPORTING = 1;
 
-IE BeaconReporting (EID_RRM_BEACON_REPORTING)
+IE rrm_reporting (EID_RRM_REPORTING)
 {
-     reportingCondition, 1;
-     threshold,          1;
+     reporting_condition, 1;
+     threshold,           1;
 }
 
 IE BcnReportingDetail (EID_RRM_BCN_REPORTING_DETAIL)
@@ -3090,6 +3098,14 @@ IE MeasurementRequest (EID_MEAS_REQUEST)  // 7.3.2.21
            meas_start_time[8];
            meas_duration,    2;
        }
+       channel_load (measurement_type IS 3)
+       {
+           op_class,                1;
+           channel,                 1;
+           randomization_intv,      2;
+           meas_duration,           2;
+           OPTIE rrm_reporting;
+       }
        Beacon (measurement_type IS 5)
        {
           regClass,          1;
@@ -3099,7 +3115,7 @@ IE MeasurementRequest (EID_MEAS_REQUEST)  // 7.3.2.21
           meas_mode,         1;
           BSSID[6];
           OPTIE SSID;
-          OPTIE BeaconReporting;
+          OPTIE rrm_reporting;
           OPTIE BcnReportingDetail;
           OPTIE RequestedInfo;
           OPTIE APChannelReport[0..2];

core/mac/src/include/dot11f.h

@@ -27,7 +27,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Mon Aug 14 23:24:30 2023 from the following file(s):
+ * Wed Aug 16 05:58:15 2023 from the following file(s):
  *
  * dot11f.frms
  *
@@ -3276,46 +3276,6 @@ uint32_t dot11f_get_packed_ie_BeaconReportFrmBody(
 }; /* End extern "C". */
 #endif /* C++ */
 
-/* EID 1 (0x01) */
-typedef struct sDot11fIEBeaconReporting {
-	uint8_t             present;
-	uint8_t             reportingCondition;
-	uint8_t             threshold;
-} tDot11fIEBeaconReporting;
-
-#define DOT11F_EID_BEACONREPORTING (1)
-
-/* N.B. These #defines do *not* include the EID & length */
-#define DOT11F_IE_BEACONREPORTING_MIN_LEN (2)
-
-#define DOT11F_IE_BEACONREPORTING_MAX_LEN (2)
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* C++ */
-__must_check uint32_t dot11f_unpack_ie_beacon_reporting(
-	tpAniSirGlobal,
-	uint8_t *,
-	uint8_t,
-	tDot11fIEBeaconReporting*,
-	bool);
-
-uint32_t dot11f_pack_ie_beacon_reporting(
-	tpAniSirGlobal,
-	tDot11fIEBeaconReporting *,
-	uint8_t *,
-	uint32_t,
-	uint32_t*);
-
-uint32_t dot11f_get_packed_ie_BeaconReporting(
-	tpAniSirGlobal,
-	tDot11fIEBeaconReporting *,
-	uint32_t*);
-
-#ifdef __cplusplus
-}; /* End extern "C". */
-#endif /* C++ */
-
 /* EID 2 (0x02) */
 typedef struct sDot11fIECondensedCountryStr {
 	uint8_t             present;
@@ -4722,6 +4682,46 @@ uint32_t dot11f_get_packed_ie_req_mac_addr(
 }; /* End extern "C". */
 #endif /* C++ */
 
+/* EID 1 (0x01) */
+typedef struct sDot11fIErrm_reporting {
+	uint8_t             present;
+	uint8_t             reporting_condition;
+	uint8_t             threshold;
+} tDot11fIErrm_reporting;
+
+#define DOT11F_EID_RRM_REPORTING (1)
+
+/* N.B. These #defines do *not* include the EID & length */
+#define DOT11F_IE_RRM_REPORTING_MIN_LEN (2)
+
+#define DOT11F_IE_RRM_REPORTING_MAX_LEN (2)
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* C++ */
+__must_check uint32_t dot11f_unpack_ie_rrm_reporting(
+	tpAniSirGlobal,
+	uint8_t *,
+	uint8_t,
+	tDot11fIErrm_reporting*,
+	bool);
+
+uint32_t dot11f_pack_ie_rrm_reporting(
+	tpAniSirGlobal,
+	tDot11fIErrm_reporting *,
+	uint8_t *,
+	uint32_t,
+	uint32_t*);
+
+uint32_t dot11f_get_packed_ie_rrm_reporting(
+	tpAniSirGlobal,
+	tDot11fIErrm_reporting *,
+	uint32_t*);
+
+#ifdef __cplusplus
+}; /* End extern "C". */
+#endif /* C++ */
+
 /* EID 255 (0xff) Extended EID 89 (0x59) */
 typedef struct sDot11fIEtclas_mask {
 	uint8_t             present;
@@ -6014,6 +6014,13 @@ typedef struct sDot11fIEMeasurementReport {
 			uint8_t rpi6_density;
 			uint8_t rpi7_density;
 		} RPIHistogram; /* type = 2 */
+		struct {
+			uint8_t op_class;
+			uint8_t channel;
+			tDOT11F_U64 meas_start_time;
+			uint16_t meas_duration;
+			uint8_t chan_load;
+		} channel_load_report; /* type = 3 */
 		struct {
 			uint8_t regClass;
 			uint8_t channel;
@@ -6141,6 +6148,13 @@ typedef struct sDot11fIEMeasurementRequest {
 			uint8_t meas_start_time[8];
 			uint16_t meas_duration;
 		} RPIHistogram; /* measurement_type = 2 */
+		struct {
+			uint8_t op_class;
+			uint8_t channel;
+			uint16_t randomization_intv;
+			uint16_t meas_duration;
+	tDot11fIErrm_reporting rrm_reporting;
+		} channel_load; /* measurement_type = 3 */
 		struct {
 			uint8_t regClass;
 			uint8_t channel;
@@ -6149,7 +6163,7 @@ typedef struct sDot11fIEMeasurementRequest {
 			uint8_t meas_mode;
 			uint8_t BSSID[6];
 	tDot11fIESSID SSID;
-	tDot11fIEBeaconReporting BeaconReporting;
+	tDot11fIErrm_reporting rrm_reporting;
 	tDot11fIEBcnReportingDetail BcnReportingDetail;
 	tDot11fIERequestedInfo RequestedInfo;
 	uint16_t num_APChannelReport;

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

@@ -25,7 +25,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Mon Aug 14 23:24:30 2023 from the following file(s):
+ * Wed Aug 16 05:58:15 2023 from the following file(s):
  *
  * dot11f.frms
  *
@@ -2106,38 +2106,6 @@ uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx,
 #define SigIeBeaconReportFrmBody (0x0007)
 
 
-uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx,
-					  uint8_t *pBuf,
-					  uint8_t ielen,
-					  tDot11fIEBeaconReporting *pDst,
-					  bool append_ie)
-{
-	uint32_t status = DOT11F_PARSE_SUCCESS;
-	(void) pBuf; (void)ielen; /* Shutup the compiler */
-	if (pDst->present)
-		return DOT11F_DUPLICATE_IE;
-	pDst->present = 1;
-	if (unlikely(ielen < 1)) {
-		pDst->present = 0;
-		return DOT11F_INCOMPLETE_IE;
-	}
-
-	pDst->reportingCondition = *pBuf;
-	pBuf += 1;
-	ielen -= (uint8_t)1;
-	if (unlikely(ielen < 1)) {
-		pDst->present = 0;
-		return DOT11F_INCOMPLETE_IE;
-	}
-
-	pDst->threshold = *pBuf;
-	(void)pCtx;
-	return status;
-} /* End dot11f_unpack_ie_beacon_reporting. */
-
-#define SigIeBeaconReporting (0x0008)
-
-
 uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx,
 					      uint8_t *pBuf,
 					      uint8_t ielen,
@@ -2159,7 +2127,7 @@ uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_condensed_country_str. */
 
-#define SigIeCondensedCountryStr (0x0009)
+#define SigIeCondensedCountryStr (0x0008)
 
 
 uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx,
@@ -2187,7 +2155,7 @@ uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_measurement_pilot. */
 
-#define SigIeMeasurementPilot (0x000a)
+#define SigIeMeasurementPilot (0x0009)
 
 
 uint32_t dot11f_unpack_ie_multi_bssid(tpAniSirGlobal pCtx,
@@ -2215,7 +2183,7 @@ uint32_t dot11f_unpack_ie_multi_bssid(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_multi_bssid. */
 
-#define SigIeMultiBssid (0x000b)
+#define SigIeMultiBssid (0x000a)
 
 
 uint32_t dot11f_unpack_ie_ric_data(tpAniSirGlobal pCtx,
@@ -2255,7 +2223,7 @@ uint32_t dot11f_unpack_ie_ric_data(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_ric_data. */
 
-#define SigIeRICData (0x000c)
+#define SigIeRICData (0x000b)
 
 
 uint32_t dot11f_unpack_ie_ric_descriptor(tpAniSirGlobal pCtx,
@@ -2283,7 +2251,7 @@ uint32_t dot11f_unpack_ie_ric_descriptor(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_ric_descriptor. */
 
-#define SigIeRICDescriptor (0x000d)
+#define SigIeRICDescriptor (0x000c)
 
 
 uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx,
@@ -2375,7 +2343,7 @@ uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_rrm_enabled_cap. */
 
-#define SigIeRRMEnabledCap (0x000e)
+#define SigIeRRMEnabledCap (0x000d)
 
 
 uint32_t dot11f_unpack_ie_requested_info(tpAniSirGlobal pCtx,
@@ -2395,7 +2363,7 @@ uint32_t dot11f_unpack_ie_requested_info(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_requested_info. */
 
-#define SigIeRequestedInfo (0x000f)
+#define SigIeRequestedInfo (0x000e)
 
 
 uint32_t dot11f_unpack_ie_ssid(tpAniSirGlobal pCtx,
@@ -2422,7 +2390,7 @@ uint32_t dot11f_unpack_ie_ssid(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_ssid. */
 
-#define SigIeSSID (0x0010)
+#define SigIeSSID (0x000f)
 
 
 uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx,
@@ -2483,7 +2451,7 @@ uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_schedule. */
 
-#define SigIeSchedule (0x0011)
+#define SigIeSchedule (0x0010)
 
 
 uint32_t dot11f_unpack_ie_tclas(tpAniSirGlobal pCtx,
@@ -2675,10 +2643,10 @@ uint32_t dot11f_unpack_ie_tclas(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_tclas. */
 
-#define SigIeTCLAS (0x0012)
+#define SigIeTCLAS (0x0011)
 
 
-#define SigIeTCLASSPROC (0x0013)
+#define SigIeTCLASSPROC (0x0012)
 
 
 uint32_t dot11f_unpack_ie_ts_delay(tpAniSirGlobal pCtx,
@@ -2702,7 +2670,7 @@ uint32_t dot11f_unpack_ie_ts_delay(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_ts_delay. */
 
-#define SigIeTSDelay (0x0014)
+#define SigIeTSDelay (0x0013)
 
 
 uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx,
@@ -2734,7 +2702,7 @@ uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_tsf_info. */
 
-#define SigIeTSFInfo (0x0015)
+#define SigIeTSFInfo (0x0014)
 
 
 uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx,
@@ -2901,7 +2869,7 @@ uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_tspec. */
 
-#define SigIeTSPEC (0x0016)
+#define SigIeTSPEC (0x0015)
 
 
 uint32_t dot11f_unpack_ie_vht_caps(tpAniSirGlobal pCtx,
@@ -2985,7 +2953,7 @@ uint32_t dot11f_unpack_ie_vht_caps(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_vht_caps. */
 
-#define SigIeVHTCaps (0x0017)
+#define SigIeVHTCaps (0x0016)
 
 
 uint32_t dot11f_unpack_ie_vht_operation(tpAniSirGlobal pCtx,
@@ -3033,7 +3001,7 @@ uint32_t dot11f_unpack_ie_vht_operation(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_vht_operation. */
 
-#define SigIeVHTOperation (0x0018)
+#define SigIeVHTOperation (0x0017)
 
 
 uint32_t dot11f_unpack_ie_wmm_schedule(tpAniSirGlobal pCtx,
@@ -3106,7 +3074,7 @@ uint32_t dot11f_unpack_ie_wmm_schedule(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_wmm_schedule. */
 
-#define SigIeWMMSchedule (0x0019)
+#define SigIeWMMSchedule (0x0018)
 
 
 uint32_t dot11f_unpack_ie_wmmtclas(tpAniSirGlobal pCtx,
@@ -3310,7 +3278,7 @@ uint32_t dot11f_unpack_ie_wmmtclas(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_wmmtclas. */
 
-#define SigIeWMMTCLAS (0x001a)
+#define SigIeWMMTCLAS (0x0019)
 
 
 uint32_t dot11f_unpack_ie_wmmtclasproc(tpAniSirGlobal pCtx,
@@ -3346,7 +3314,7 @@ uint32_t dot11f_unpack_ie_wmmtclasproc(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_wmmtclasproc. */
 
-#define SigIeWMMTCLASPROC (0x001b)
+#define SigIeWMMTCLASPROC (0x001a)
 
 
 uint32_t dot11f_unpack_ie_wmmts_delay(tpAniSirGlobal pCtx,
@@ -3382,7 +3350,7 @@ uint32_t dot11f_unpack_ie_wmmts_delay(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_wmmts_delay. */
 
-#define SigIeWMMTSDelay (0x001c)
+#define SigIeWMMTSDelay (0x001b)
 
 
 uint32_t dot11f_unpack_ie_wmmtspec(tpAniSirGlobal pCtx,
@@ -3561,7 +3529,7 @@ uint32_t dot11f_unpack_ie_wmmtspec(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_wmmtspec. */
 
-#define SigIeWMMTSPEC (0x001d)
+#define SigIeWMMTSPEC (0x001c)
 
 
 uint32_t dot11f_unpack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx,
@@ -3601,7 +3569,7 @@ uint32_t dot11f_unpack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_wider_bw_chan_switch_ann. */
 
-#define SigIeWiderBWChanSwitchAnn (0x001e)
+#define SigIeWiderBWChanSwitchAnn (0x001d)
 
 
 uint32_t dot11f_unpack_ie_azimuth_req(tpAniSirGlobal pCtx,
@@ -3625,7 +3593,7 @@ uint32_t dot11f_unpack_ie_azimuth_req(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_azimuth_req. */
 
-#define SigIeazimuth_req (0x001f)
+#define SigIeazimuth_req (0x001e)
 
 
 uint32_t dot11f_unpack_ie_beacon_report_frm_body_fragment_id(tpAniSirGlobal pCtx,
@@ -3653,7 +3621,7 @@ uint32_t dot11f_unpack_ie_beacon_report_frm_body_fragment_id(tpAniSirGlobal pCtx
 	return status;
 } /* End dot11f_unpack_ie_beacon_report_frm_body_fragment_id. */
 
-#define SigIebeacon_report_frm_body_fragment_id (0x0020)
+#define SigIebeacon_report_frm_body_fragment_id (0x001f)
 
 
 uint32_t dot11f_unpack_ie_last_beacon_report_indication(tpAniSirGlobal pCtx,
@@ -3677,7 +3645,7 @@ uint32_t dot11f_unpack_ie_last_beacon_report_indication(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_last_beacon_report_indication. */
 
-#define SigIelast_beacon_report_indication (0x0021)
+#define SigIelast_beacon_report_indication (0x0020)
 
 
 uint32_t dot11f_unpack_ie_max_age(tpAniSirGlobal pCtx,
@@ -3701,7 +3669,7 @@ uint32_t dot11f_unpack_ie_max_age(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_max_age. */
 
-#define SigIemax_age (0x0022)
+#define SigIemax_age (0x0021)
 
 
 uint32_t dot11f_unpack_ie_mscs_status(tpAniSirGlobal pCtx,
@@ -3725,7 +3693,7 @@ uint32_t dot11f_unpack_ie_mscs_status(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_mscs_status. */
 
-#define SigIemscs_status (0x0023)
+#define SigIemscs_status (0x0022)
 
 
 static const tFFDefn FFS_neighbor_rpt[] = {
@@ -3847,7 +3815,7 @@ uint32_t dot11f_unpack_ie_neighbor_rpt(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_neighbor_rpt. */
 
-#define SigIeneighbor_rpt (0x0024)
+#define SigIeneighbor_rpt (0x0023)
 
 
 uint32_t dot11f_unpack_ie_reporting_reason(tpAniSirGlobal pCtx,
@@ -3880,7 +3848,7 @@ uint32_t dot11f_unpack_ie_reporting_reason(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_reporting_reason. */
 
-#define SigIereporting_reason (0x0025)
+#define SigIereporting_reason (0x0024)
 
 
 uint32_t dot11f_unpack_ie_req_mac_addr(tpAniSirGlobal pCtx,
@@ -3904,7 +3872,39 @@ uint32_t dot11f_unpack_ie_req_mac_addr(tpAniSirGlobal pCtx,
 	return status;
 } /* End dot11f_unpack_ie_req_mac_addr. */
 
-#define SigIereq_mac_addr (0x0026)
+#define SigIereq_mac_addr (0x0025)
+
+
+uint32_t dot11f_unpack_ie_rrm_reporting(tpAniSirGlobal pCtx,
+					 uint8_t *pBuf,
+					 uint8_t ielen,
+					 tDot11fIErrm_reporting *pDst,
+					 bool append_ie)
+{
+	uint32_t status = DOT11F_PARSE_SUCCESS;
+	(void) pBuf; (void)ielen; /* Shutup the compiler */
+	if (pDst->present)
+		return DOT11F_DUPLICATE_IE;
+	pDst->present = 1;
+	if (unlikely(ielen < 1)) {
+		pDst->present = 0;
+		return DOT11F_INCOMPLETE_IE;
+	}
+
+	pDst->reporting_condition = *pBuf;
+	pBuf += 1;
+	ielen -= (uint8_t)1;
+	if (unlikely(ielen < 1)) {
+		pDst->present = 0;
+		return DOT11F_INCOMPLETE_IE;
+	}
+
+	pDst->threshold = *pBuf;
+	(void)pCtx;
+	return status;
+} /* End dot11f_unpack_ie_rrm_reporting. */
+
+#define SigIerrm_reporting (0x0026)
 
 
 uint32_t dot11f_unpack_ie_tclas_mask(tpAniSirGlobal pCtx,
@@ -5460,6 +5460,48 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx,
 			pBuf += 1;
 			ielen -= (uint8_t)1;
 			break;
+		case 3:
+			if (unlikely(ielen < 1)) {
+				pDst->present = 0;
+				return DOT11F_INCOMPLETE_IE;
+			}
+
+			pDst->report.channel_load_report.op_class = *pBuf;
+			pBuf += 1;
+			ielen -= (uint8_t)1;
+			if (unlikely(ielen < 1)) {
+				pDst->present = 0;
+				return DOT11F_INCOMPLETE_IE;
+			}
+
+			pDst->report.channel_load_report.channel = *pBuf;
+			pBuf += 1;
+			ielen -= (uint8_t)1;
+			if (unlikely(ielen < 8)) {
+				pDst->present = 0;
+				return DOT11F_INCOMPLETE_IE;
+			}
+
+			framesntohq(pCtx, &pDst->report.channel_load_report.meas_start_time, pBuf, 0);
+			pBuf += 8;
+			ielen -= (uint8_t)8;
+			if (unlikely(ielen < 2)) {
+				pDst->present = 0;
+				return DOT11F_INCOMPLETE_IE;
+			}
+
+			framesntohs(pCtx, &pDst->report.channel_load_report.meas_duration, pBuf, 0);
+			pBuf += 2;
+			ielen -= (uint8_t)2;
+			if (unlikely(ielen < 1)) {
+				pDst->present = 0;
+				return DOT11F_INCOMPLETE_IE;
+			}
+
+			pDst->report.channel_load_report.chan_load = *pBuf;
+			pBuf += 1;
+			ielen -= (uint8_t)1;
+			break;
 		case 5:
 			if (unlikely(ielen < 1)) {
 				pDst->present = 0;
@@ -5859,6 +5901,19 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx,
 #define SigIeMeasurementReport (0x0043)
 
 
+static const tFFDefn FFS_measurement_requestchannel_load[] = {
+	{ NULL, 0, 0, 0,},
+};
+
+static const tIEDefn IES_measurement_requestchannel_load[] = {
+	{ offsetof(tDot11fIEMeasurementRequest,
+	measurement_request.channel_load.rrm_reporting),
+	offsetof(tDot11fIErrm_reporting, present), 0, "rrm_reporting",
+	0, 4, 4, SigIerrm_reporting, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_RRM_REPORTING, 0, 0, },
+	{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },
+};
+
 static const tFFDefn FFS_measurement_requestBeacon[] = {
 	{ NULL, 0, 0, 0,},
 };
@@ -5868,10 +5923,10 @@ static const tIEDefn IES_measurement_requestBeacon[] = {
 	measurement_request.Beacon.SSID), offsetof(tDot11fIESSID, present), 0,
 	"SSID", 0, 2, 34, SigIeSSID, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SSID, 0, 0, },
 	{ offsetof(tDot11fIEMeasurementRequest,
-	measurement_request.Beacon.BeaconReporting),
-	offsetof(tDot11fIEBeaconReporting, present), 0, "BeaconReporting",
-	0, 4, 4, SigIeBeaconReporting, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_BEACONREPORTING, 0, 0, },
+	measurement_request.Beacon.rrm_reporting),
+	offsetof(tDot11fIErrm_reporting, present), 0, "rrm_reporting",
+	0, 4, 4, SigIerrm_reporting, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_RRM_REPORTING, 0, 0, },
 	{ offsetof(tDot11fIEMeasurementRequest,
 	measurement_request.Beacon.BcnReportingDetail),
 	offsetof(tDot11fIEBcnReportingDetail, present), 0, "BcnReportingDetail",
@@ -6056,6 +6111,47 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx,
 		pBuf += 2;
 		ielen -= (uint8_t)2;
 		break;
+	case 3:
+		if (unlikely(ielen < 1)) {
+			pDst->present = 0;
+			return DOT11F_INCOMPLETE_IE;
+		}
+
+		pDst->measurement_request.channel_load.op_class = *pBuf;
+		pBuf += 1;
+		ielen -= (uint8_t)1;
+		if (unlikely(ielen < 1)) {
+			pDst->present = 0;
+			return DOT11F_INCOMPLETE_IE;
+		}
+
+		pDst->measurement_request.channel_load.channel = *pBuf;
+		pBuf += 1;
+		ielen -= (uint8_t)1;
+		if (unlikely(ielen < 2)) {
+			pDst->present = 0;
+			return DOT11F_INCOMPLETE_IE;
+		}
+
+		framesntohs(pCtx, &pDst->measurement_request.channel_load.randomization_intv, pBuf, 0);
+		pBuf += 2;
+		ielen -= (uint8_t)2;
+		if (unlikely(ielen < 2)) {
+			pDst->present = 0;
+			return DOT11F_INCOMPLETE_IE;
+		}
+
+		framesntohs(pCtx, &pDst->measurement_request.channel_load.meas_duration, pBuf, 0);
+		pBuf += 2;
+		ielen -= (uint8_t)2;
+		status |= unpack_core(pCtx,
+				pBuf,
+				ielen,
+				FFS_measurement_requestchannel_load,
+				IES_measurement_requestchannel_load,
+				(uint8_t *)pDst,
+				sizeof(*pDst), append_ie);
+		break;
 	case 5:
 		if (unlikely(ielen < 1)) {
 			pDst->present = 0;
@@ -15275,16 +15371,6 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx,
 						    countOffset),
 						    append_ie);
 					break;
-				case SigIeBeaconReporting:
-					status |=
-						dot11f_unpack_ie_beacon_reporting(
-						    pCtx, pBufRemaining, len,
-						    (tDot11fIEBeaconReporting *)
-						    (pFrm + pIe->offset +
-						    sizeof(tDot11fIEBeaconReporting) *
-						    countOffset),
-						    append_ie);
-					break;
 				case SigIeCondensedCountryStr:
 					status |=
 						dot11f_unpack_ie_condensed_country_str(
@@ -15580,6 +15666,16 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx,
 						    countOffset),
 						    append_ie);
 					break;
+				case SigIerrm_reporting:
+					status |=
+						dot11f_unpack_ie_rrm_reporting(
+						    pCtx, pBufRemaining, len,
+						    (tDot11fIErrm_reporting *)
+						    (pFrm + pIe->offset +
+						    sizeof(tDot11fIErrm_reporting) *
+						    countOffset),
+						    append_ie);
+					break;
 				case SigIetclas_mask:
 					status |=
 						dot11f_unpack_ie_tclas_mask(
@@ -17799,6 +17895,13 @@ uint32_t dot11f_get_packed_ie_measurement_report(tpAniSirGlobal pCtx,
 				*pnNeeded += 1;
 				*pnNeeded += 1;
 				break;
+			case 3:
+				*pnNeeded += 1;
+				*pnNeeded += 1;
+				*pnNeeded += 8;
+				*pnNeeded += 2;
+				*pnNeeded += 1;
+				break;
 			case 5:
 				*pnNeeded += 1;
 				*pnNeeded += 1;
@@ -17894,6 +17997,13 @@ uint32_t dot11f_get_packed_ie_measurement_request(tpAniSirGlobal pCtx,
 			*pnNeeded += 8;
 			*pnNeeded += 2;
 			break;
+		case 3:
+			*pnNeeded += 1;
+			*pnNeeded += 1;
+			*pnNeeded += 2;
+			*pnNeeded += 2;
+			status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, IES_measurement_requestchannel_load);
+			break;
 		case 5:
 			*pnNeeded += 1;
 			*pnNeeded += 1;
@@ -19228,13 +19338,6 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx,
 					  (pFrm + pIe->offset + offset * i))->
 					  present;
 					break;
-				case SigIeBeaconReporting:
-					offset = sizeof(tDot11fIEBeaconReporting);
-					byteCount = 2;
-					pIePresent = ((tDot11fIEBeaconReporting *)
-					  (pFrm + pIe->offset + offset * i))->
-					  present;
-					break;
 				case SigIeCondensedCountryStr:
 					offset = sizeof(tDot11fIECondensedCountryStr);
 					byteCount = 2;
@@ -19458,6 +19561,13 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx,
 					  (pFrm + pIe->offset + offset * i))->
 					  present;
 					break;
+				case SigIerrm_reporting:
+					offset = sizeof(tDot11fIErrm_reporting);
+					byteCount = 2;
+					pIePresent = ((tDot11fIErrm_reporting *)
+					  (pFrm + pIe->offset + offset * i))->
+					  present;
+					break;
 				case SigIetclas_mask:
 					offset = sizeof(tDot11fIEtclas_mask);
 					status |=
@@ -23242,38 +23352,6 @@ uint32_t dot11f_pack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx,
 	return DOT11F_PARSE_SUCCESS;
 } /* End dot11f_pack_ie_beacon_report_frm_body. */
 
-uint32_t dot11f_pack_ie_beacon_reporting(tpAniSirGlobal pCtx,
-					tDot11fIEBeaconReporting *pSrc,
-					uint8_t *pBuf,
-					uint32_t nBuf,
-					uint32_t *pnConsumed)
-{
-	uint8_t *pIeLen = 0;
-	uint32_t nConsumedOnEntry = *pnConsumed;
-	uint32_t nNeeded = 0U;
-	nNeeded  += 2;
-	while (pSrc->present) {
-		if (nNeeded > nBuf)
-			return DOT11F_BUFFER_OVERFLOW;
-		*pBuf = 1;
-		++pBuf; ++(*pnConsumed);
-		pIeLen = pBuf;
-		++pBuf; ++(*pnConsumed);
-		*pBuf = pSrc->reportingCondition;
-		*pnConsumed += 1;
-		pBuf += 1;
-		*pBuf = pSrc->threshold;
-		*pnConsumed += 1;
-		/* fieldsEndFlag = 1 */
-		break;
-	}
-	(void)pCtx;
-	if (pIeLen) {
-		*pIeLen = *pnConsumed - nConsumedOnEntry - 2;
-	}
-	return DOT11F_PARSE_SUCCESS;
-} /* End dot11f_pack_ie_beacon_reporting. */
-
 uint32_t dot11f_pack_ie_condensed_country_str(tpAniSirGlobal pCtx,
 					    tDot11fIECondensedCountryStr *pSrc,
 					    uint8_t *pBuf,
@@ -24792,6 +24870,38 @@ uint32_t dot11f_pack_ie_req_mac_addr(tpAniSirGlobal pCtx,
 	return DOT11F_PARSE_SUCCESS;
 } /* End dot11f_pack_ie_req_mac_addr. */
 
+uint32_t dot11f_pack_ie_rrm_reporting(tpAniSirGlobal pCtx,
+				      tDot11fIErrm_reporting *pSrc,
+				      uint8_t *pBuf,
+				      uint32_t nBuf,
+				      uint32_t *pnConsumed)
+{
+	uint8_t *pIeLen = 0;
+	uint32_t nConsumedOnEntry = *pnConsumed;
+	uint32_t nNeeded = 0U;
+	nNeeded  += 2;
+	while (pSrc->present) {
+		if (nNeeded > nBuf)
+			return DOT11F_BUFFER_OVERFLOW;
+		*pBuf = 1;
+		++pBuf; ++(*pnConsumed);
+		pIeLen = pBuf;
+		++pBuf; ++(*pnConsumed);
+		*pBuf = pSrc->reporting_condition;
+		*pnConsumed += 1;
+		pBuf += 1;
+		*pBuf = pSrc->threshold;
+		*pnConsumed += 1;
+		/* fieldsEndFlag = 1 */
+		break;
+	}
+	(void)pCtx;
+	if (pIeLen) {
+		*pIeLen = *pnConsumed - nConsumedOnEntry - 2;
+	}
+	return DOT11F_PARSE_SUCCESS;
+} /* End dot11f_pack_ie_rrm_reporting. */
+
 uint32_t dot11f_pack_ie_tclas_mask(tpAniSirGlobal pCtx,
 				   tDot11fIEtclas_mask *pSrc,
 				   uint8_t *pBuf,
@@ -26196,6 +26306,23 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx,
 				*pnConsumed += 1;
 				/* fieldsEndFlag = 1 */
 				break;
+			case 3:
+				*pBuf = pSrc->report.channel_load_report.op_class;
+				*pnConsumed += 1;
+				pBuf += 1;
+				*pBuf = pSrc->report.channel_load_report.channel;
+				*pnConsumed += 1;
+				pBuf += 1;
+				frameshtonq(pCtx, pBuf, pSrc->report.channel_load_report.meas_start_time, 0);
+				*pnConsumed += 8;
+				pBuf += 8;
+				frameshtons(pCtx, pBuf, pSrc->report.channel_load_report.meas_duration, 0);
+				*pnConsumed += 2;
+				pBuf += 2;
+				*pBuf = pSrc->report.channel_load_report.chan_load;
+				*pnConsumed += 1;
+				/* fieldsEndFlag = 1 */
+				break;
 			case 5:
 				*pBuf = pSrc->report.Beacon.regClass;
 				*pnConsumed += 1;
@@ -26454,6 +26581,27 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx,
 			*pnConsumed += 2;
 			/* fieldsEndFlag = 1 */
 			break;
+		case 3:
+			*pBuf = pSrc->measurement_request.channel_load.op_class;
+			*pnConsumed += 1;
+			pBuf += 1;
+			*pBuf = pSrc->measurement_request.channel_load.channel;
+			*pnConsumed += 1;
+			pBuf += 1;
+			frameshtons(pCtx, pBuf, pSrc->measurement_request.channel_load.randomization_intv, 0);
+			*pnConsumed += 2;
+			pBuf += 2;
+			frameshtons(pCtx, pBuf, pSrc->measurement_request.channel_load.meas_duration, 0);
+			*pnConsumed += 2;
+			pBuf += 2;
+			status = pack_core(pCtx,
+				 (uint8_t *)pSrc,
+				 pBuf,
+				 nBuf,
+				 pnConsumed,
+				 FFS_measurement_requestchannel_load,
+				 IES_measurement_requestchannel_load);
+			break;
 		case 5:
 			*pBuf = pSrc->measurement_request.Beacon.regClass;
 			*pnConsumed += 1;
@@ -32458,14 +32606,6 @@ static uint32_t pack_core(tpAniSirGlobal pCtx,
 				sizeof(tDot11fIEBeaconReportFrmBody) * i),
 				pBufRemaining, nBufRemaining, &len);
 			break;
-			case SigIeBeaconReporting:
-			status |=
-				dot11f_pack_ie_beacon_reporting(
-				pCtx, (tDot11fIEBeaconReporting *)
-				(pSrc + pIe->offset +
-				sizeof(tDot11fIEBeaconReporting) * i),
-				pBufRemaining, nBufRemaining, &len);
-			break;
 			case SigIeCondensedCountryStr:
 			status |=
 				dot11f_pack_ie_condensed_country_str(
@@ -32706,6 +32846,14 @@ static uint32_t pack_core(tpAniSirGlobal pCtx,
 				sizeof(tDot11fIEreq_mac_addr) * i),
 				pBufRemaining, nBufRemaining, &len);
 			break;
+			case SigIerrm_reporting:
+			status |=
+				dot11f_pack_ie_rrm_reporting(
+				pCtx, (tDot11fIErrm_reporting *)
+				(pSrc + pIe->offset +
+				sizeof(tDot11fIErrm_reporting) * i),
+				pBufRemaining, nBufRemaining, &len);
+			break;
 			case SigIetclas_mask:
 			status |=
 				dot11f_pack_ie_tclas_mask(