Browse Source

qcacld-3.0: Revert dot11 parser changes for beacon report err vsie

Use manual parser instead of dot11 frame parser for beacon
report err vsie

Change-Id: I55f954f3ed34b1d3c0e44e9db34fec1a15c80932
CRs-Fixed: 2619659
sheenam monga 5 years ago
parent
commit
604dad7dc0

+ 0 - 9
core/mac/src/cfg/cfgUtil/dot11f.frms

@@ -2036,14 +2036,6 @@ IE ESERadMgmtCap (EID_VENDOR_SPECIFIC) OUI (0x00, 0x40, 0x96, 0x01)
 
 }
 
-IE BeaconReportStatus (EID_VENDOR_SPECIFIC) OUI (0x00, 0x00, 0x00F, 0x22)
-{
-        sub_type,       1;
-        version,        1;
-        length,         1;
-        reason_code,    1;
-}
-
 IE Vendor1IE (EID_VENDOR_SPECIFIC) OUI (0x00, 0x10, 0x18)
 {
 }
@@ -4132,7 +4124,6 @@ FRAME RadioMeasurementReport
    FF   DialogToken;
    //Measurement Report elements.
    MANDIE MeasurementReport[1..4];
-   OPTIE  BeaconReportStatus;
 }
 
 FRAME LinkMeasurementRequest

+ 6 - 49
core/mac/src/include/dot11f.h

@@ -26,7 +26,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Thu Jan 30 16:28:12 2020 from the following file(s):
+ * Wed Feb 12 21:00:55 2020 from the following file(s):
  *
  * dot11f.frms
  *
@@ -4408,48 +4408,6 @@ uint32_t dot11f_get_packed_ie_AID(
 }; /* End extern "C". */
 #endif /* C++ */
 
-/* EID 221 (0xdd) {OUI 0x00, 0x00, 0x0f, 0x22} */
-typedef struct sDot11fIEBeaconReportStatus {
-	uint8_t             present;
-	uint8_t             sub_type;
-	uint8_t             version;
-	uint8_t             length;
-	uint8_t             reason_code;
-} tDot11fIEBeaconReportStatus;
-
-#define DOT11F_EID_BEACONREPORTSTATUS (221)
-
-/* N.B. These #defines do *not* include the EID & length */
-#define DOT11F_IE_BEACONREPORTSTATUS_MIN_LEN (8)
-
-#define DOT11F_IE_BEACONREPORTSTATUS_MAX_LEN (8)
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* C++ */
-__must_check uint32_t dot11f_unpack_ie_BeaconReportStatus(
-	tpAniSirGlobal,
-	uint8_t *,
-	uint8_t,
-	tDot11fIEBeaconReportStatus*,
-	bool);
-
-uint32_t dot11f_pack_ie_BeaconReportStatus(
-	tpAniSirGlobal,
-	tDot11fIEBeaconReportStatus *,
-	uint8_t *,
-	uint32_t,
-	uint32_t*);
-
-uint32_t dot11f_get_packed_ie_BeaconReportStatus(
-	tpAniSirGlobal,
-	tDot11fIEBeaconReportStatus *,
-	uint32_t*);
-
-#ifdef __cplusplus
-}; /* End extern "C". */
-#endif /* C++ */
-
 /* EID 4 (0x04) */
 typedef struct sDot11fIECFParams {
 	uint8_t             present;
@@ -10544,12 +10502,11 @@ uint32_t dot11f_get_packed_qos_map_configure_size(tpAniSirGlobal pCtx,
 #endif /* C++ */
 
 typedef struct sDot11fRadioMeasurementReport{
-	tDot11fFfCategory                  Category;
-	tDot11fFfAction                    Action;
-	tDot11fFfDialogToken               DialogToken;
-	uint16_t                           num_MeasurementReport;
-	tDot11fIEMeasurementReport         MeasurementReport[4];
-	tDot11fIEBeaconReportStatus        BeaconReportStatus;
+	tDot11fFfCategory                 Category;
+	tDot11fFfAction                   Action;
+	tDot11fFfDialogToken              DialogToken;
+	uint16_t                          num_MeasurementReport;
+	tDot11fIEMeasurementReport        MeasurementReport[4];
 } tDot11fRadioMeasurementReport;
 
 #define DOT11F_RADIOMEASUREMENTREPORT (24)

File diff suppressed because it is too large
+ 106 - 154
core/mac/src/sys/legacy/src/utils/src/dot11f.c


Some files were not shown because too many files changed in this diff