qcacld-3.0: Update EIDs for ML, EHT cap and EHT op IEs

Update element ID extensions for EHT op, ML, and EHT cap IEs
to 106, 107 and 108 respectively as per current ANA database.

Change-Id: Ifa2335f0b731a9f0a47ba1e2de3232c35a3493f9
CRs-Fixed: 3036101

core/mac/inc/sir_api.h

@@ -4955,15 +4955,15 @@ struct he_capability {
 
 #ifdef WLAN_FEATURE_11BE
 #define EHT_MAX_PHY_CAP_SIZE 3
-#define EHT_CAP_OUI_TYPE "\xfd"
-#define EHT_CAP_OUI_SIZE 1
-
-#define EHT_OP_OUI_TYPE "\xfe"
+#define EHT_OP_OUI_TYPE "\x6a"
 #define EHT_OP_OUI_SIZE 1
 
-#define MLO_IE_OUI_TYPE "\x5e"
+#define MLO_IE_OUI_TYPE "\x6b"
 #define MLO_IE_OUI_SIZE 1
 
+#define EHT_CAP_OUI_TYPE "\x6c"
+#define EHT_CAP_OUI_SIZE 1
+
 /**
  * struct eht_capability - to store 11be EHT capabilities
  * @phy_cap: EHT PHY capabilities

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

@@ -3269,7 +3269,7 @@ IE he_6ghz_band_cap (EID_EXTN_ID_ELEMENT) OUI (0x3B)
     }
 }
 
-IE eht_cap (EID_EXTN_ID_ELEMENT) OUI (0xFD)
+IE eht_cap (EID_EXTN_ID_ELEMENT) OUI (0x6C)
 {
     {
 	nsep_pri_access: 1;
@@ -3335,7 +3335,7 @@ IE eht_cap (EID_EXTN_ID_ELEMENT) OUI (0xFD)
     };
 }
 
-IE eht_op (EID_EXTN_ID_ELEMENT) OUI (0xFE)
+IE eht_op (EID_EXTN_ID_ELEMENT) OUI (0x6A)
 {
     basic_mcs_nss_set[2];
     primary_channel, 1;
@@ -3847,7 +3847,7 @@ IE sta_profile (0)
   OPTIE IE non_inheritance;
 }
 
-IE mlo_ie (EID_EXTN_ID_ELEMENT) OUI (0x5e)
+IE mlo_ie (EID_EXTN_ID_ELEMENT) OUI (0x6B)
 {
     {
         type: 3;

core/mac/src/include/dot11f.h

@@ -26,7 +26,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Wed Sep 29 13:23:21 2021 from the following file(s):
+ * Fri Sep 10 15:41:55 2021 from the following file(s):
  *
  * dot11f.frms
  *
@@ -5192,7 +5192,7 @@ uint32_t dot11f_get_packed_ie_beacon_report_frm_body_fragment_id(
 }; /* End extern "C". */
 #endif /* C++ */
 
-/* EID 255 (0xff) Extended EID 253 (0xfd) */
+/* EID 255 (0xff) Extended EID 108 (0x6c) */
 typedef struct sDot11fIEeht_cap {
 	uint8_t             present;
 	uint16_t      nsep_pri_access:1;
@@ -5288,7 +5288,7 @@ uint32_t dot11f_get_packed_ie_eht_cap(
 }; /* End extern "C". */
 #endif /* C++ */
 
-/* EID 255 (0xff) Extended EID 254 (0xfe) */
+/* EID 255 (0xff) Extended EID 106 (0x6a) */
 typedef struct sDot11fIEeht_op {
 	uint8_t             present;
 	uint8_t             basic_mcs_nss_set[2];
@@ -10082,7 +10082,7 @@ uint32_t dot11f_get_packed_ie_ht2040_bss_intolerant_report(
 }; /* End extern "C". */
 #endif /* C++ */
 
-/* EID 255 (0xff) Extended EID 94 (0x5e) */
+/* EID 255 (0xff) Extended EID 107 (0x6b) */
 typedef struct sDot11fIEmlo_ie {
 	uint8_t                     present;
 	uint16_t                         type:3;

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

@@ -24,7 +24,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Wed Sep 29 13:23:21 2021 from the following file(s):
+ * Fri Sep 10 15:41:55 2021 from the following file(s):
  *
  * dot11f.frms
  *
@@ -5947,10 +5947,10 @@ static const tIEDefn IES_sta_profile[] = {
 	0, DOT11F_EID_HE_6GHZ_BAND_CAP, 59, 0, },
 	{ offsetof(tDot11fIEsta_profile, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fIEsta_profile, eht_op), offsetof(tDot11fIEeht_op,
 	present), 0, "eht_op", 0, 9, 9, SigIeeht_op, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_OP, 254, 0, },
+	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fIEsta_profile, max_chan_switch_time),
 	offsetof(tDot11fIEmax_chan_switch_time, present), 0,
 	"max_chan_switch_time", 0, 5, 5, SigIemax_chan_switch_time,
@@ -11172,10 +11172,10 @@ static const tIEDefn IES_AssocRequest[] = {
 	{0, 0, 0, 0, 0}, 0, DOT11F_EID_DH_PARAMETER_ELEMENT, 32, 0, },
 	{ offsetof(tDot11fAssocRequest, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fAssocRequest, mlo_ie), offsetof(tDot11fIEmlo_ie,
 	present), 0, "mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fAssocRequest, WPAOpaque), offsetof(tDot11fIEWPAOpaque,
 	present), 0, "WPAOpaque", 0, 8, 255, SigIeWPAOpaque, {0, 80, 242, 1, 0},
 	4, DOT11F_EID_WPAOPAQUE, 0, 0, },
@@ -11363,13 +11363,13 @@ static const tIEDefn IES_AssocResponse[] = {
 	0, DOT11F_EID_FILS_KDE, 7, 0, },
 	{ offsetof(tDot11fAssocResponse, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fAssocResponse, eht_op), offsetof(tDot11fIEeht_op,
 	present), 0, "eht_op", 0, 9, 9, SigIeeht_op, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_OP, 254, 0, },
+	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fAssocResponse, mlo_ie), offsetof(tDot11fIEmlo_ie,
 	present), 0, "mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fAssocResponse, WPA), offsetof(tDot11fIEWPA, present), 0,
 	"WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
 	{ offsetof(tDot11fAssocResponse, WMMParams), offsetof(tDot11fIEWMMParams,
@@ -11667,13 +11667,13 @@ static const tIEDefn IES_Beacon[] = {
 	{0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, 0, },
 	{ offsetof(tDot11fBeacon, eht_cap), offsetof(tDot11fIEeht_cap, present), 0,
 	"eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fBeacon, eht_op), offsetof(tDot11fIEeht_op, present), 0,
 	"eht_op", 0, 9, 9, SigIeeht_op, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_OP, 254, 0, },
+	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fBeacon, mlo_ie), offsetof(tDot11fIEmlo_ie, present), 0,
 	"mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fBeacon, WPA), offsetof(tDot11fIEWPA, present), 0, "WPA",
 	0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
 	{ offsetof(tDot11fBeacon, WMMInfoAp), offsetof(tDot11fIEWMMInfoAp,
@@ -11919,13 +11919,13 @@ static const tIEDefn IES_Beacon2[] = {
 	{0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, 0, },
 	{ offsetof(tDot11fBeacon2, eht_cap), offsetof(tDot11fIEeht_cap, present),
 	0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fBeacon2, eht_op), offsetof(tDot11fIEeht_op, present), 0,
 	"eht_op", 0, 9, 9, SigIeeht_op, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_OP, 254, 0, },
+	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fBeacon2, mlo_ie), offsetof(tDot11fIEmlo_ie, present), 0,
 	"mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fBeacon2, WPA), offsetof(tDot11fIEWPA, present), 0, "WPA",
 	0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
 	{ offsetof(tDot11fBeacon2, WMMInfoAp), offsetof(tDot11fIEWMMInfoAp,
@@ -12162,13 +12162,13 @@ static const tIEDefn IES_BeaconIEs[] = {
 	{0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, 0, },
 	{ offsetof(tDot11fBeaconIEs, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fBeaconIEs, eht_op), offsetof(tDot11fIEeht_op, present),
 	0, "eht_op", 0, 9, 9, SigIeeht_op, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_OP, 254, 0, },
+	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fBeaconIEs, mlo_ie), offsetof(tDot11fIEmlo_ie, present),
 	0, "mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fBeaconIEs, WPA), offsetof(tDot11fIEWPA, present), 0,
 	"WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
 	{ offsetof(tDot11fBeaconIEs, WMMInfoAp), offsetof(tDot11fIEWMMInfoAp,
@@ -12639,10 +12639,10 @@ static const tIEDefn IES_ProbeRequest[] = {
 	0, DOT11F_EID_HE_6GHZ_BAND_CAP, 59, 0, },
 	{ offsetof(tDot11fProbeRequest, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fProbeRequest, mlo_ie), offsetof(tDot11fIEmlo_ie,
 	present), 0, "mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fProbeRequest, WscProbeReq),
 	offsetof(tDot11fIEWscProbeReq, present), 0, "WscProbeReq",
 	0, 6, 286, SigIeWscProbeReq, {0, 80, 242, 4, 0},
@@ -12838,13 +12838,13 @@ static const tIEDefn IES_ProbeResponse[] = {
 	4, DOT11F_EID_ESETXMITPOWER, 0, 0, },
 	{ offsetof(tDot11fProbeResponse, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fProbeResponse, eht_op), offsetof(tDot11fIEeht_op,
 	present), 0, "eht_op", 0, 9, 9, SigIeeht_op, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_OP, 254, 0, },
+	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fProbeResponse, mlo_ie), offsetof(tDot11fIEmlo_ie,
 	present), 0, "mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fProbeResponse, WPA), offsetof(tDot11fIEWPA, present), 0,
 	"WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0}, 4, DOT11F_EID_WPA, 0, 0, },
 	{ offsetof(tDot11fProbeResponse, WMMInfoAp), offsetof(tDot11fIEWMMInfoAp,
@@ -13119,10 +13119,10 @@ static const tIEDefn IES_ReAssocRequest[] = {
 	4, DOT11F_EID_ESECCKMOPAQUE, 0, 0, },
 	{ offsetof(tDot11fReAssocRequest, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fReAssocRequest, mlo_ie), offsetof(tDot11fIEmlo_ie,
 	present), 0, "mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fReAssocRequest, WPAOpaque),
 	offsetof(tDot11fIEWPAOpaque, present), 0, "WPAOpaque",
 	0, 8, 255, SigIeWPAOpaque, {0, 80, 242, 1, 0},
@@ -13292,13 +13292,13 @@ static const tIEDefn IES_ReAssocResponse[] = {
 	4, DOT11F_EID_ESETXMITPOWER, 0, 0, },
 	{ offsetof(tDot11fReAssocResponse, eht_cap), offsetof(tDot11fIEeht_cap,
 	present), 0, "eht_cap", 0, 12, 87, SigIeeht_cap, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_CAP, 253, 0, },
+	0, DOT11F_EID_EHT_CAP, 108, 0, },
 	{ offsetof(tDot11fReAssocResponse, eht_op), offsetof(tDot11fIEeht_op,
 	present), 0, "eht_op", 0, 9, 9, SigIeeht_op, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_EHT_OP, 254, 0, },
+	0, DOT11F_EID_EHT_OP, 106, 0, },
 	{ offsetof(tDot11fReAssocResponse, mlo_ie), offsetof(tDot11fIEmlo_ie,
 	present), 0, "mlo_ie", 0, 4, 1270, SigIemlo_ie, {0, 0, 0, 0, 0},
-	0, DOT11F_EID_MLO_IE, 94, 0, },
+	0, DOT11F_EID_MLO_IE, 107, 0, },
 	{ offsetof(tDot11fReAssocResponse, WPA), offsetof(tDot11fIEWPA, present),
 	0, "WPA", 0, 8, 50, SigIeWPA, {0, 80, 242, 1, 0},
 	4, DOT11F_EID_WPA, 0, 0, },
@@ -25057,7 +25057,7 @@ uint32_t dot11f_pack_ie_eht_cap(tpAniSirGlobal pCtx,
 		++pBuf; ++(*pnConsumed);
 		pIeLen = pBuf;
 		++pBuf; ++(*pnConsumed);
-		*pBuf = 253;
+		*pBuf = 108;
 		++pBuf; ++(*pnConsumed);
 		tmp172__ = 0U;
 		tmp172__ |= (pSrc->nsep_pri_access << 0);
@@ -25178,7 +25178,7 @@ uint32_t dot11f_pack_ie_eht_op(tpAniSirGlobal pCtx,
 		++pBuf; ++(*pnConsumed);
 		pIeLen = pBuf;
 		++pBuf; ++(*pnConsumed);
-		*pBuf = 254;
+		*pBuf = 106;
 		++pBuf; ++(*pnConsumed);
 		DOT11F_MEMCPY(pCtx, pBuf, pSrc->basic_mcs_nss_set, 2);
 		*pnConsumed += 2;
@@ -29927,7 +29927,7 @@ uint32_t dot11f_pack_ie_mlo_ie(tpAniSirGlobal pCtx,
 		++pBuf; --nBuf; ++(*pnConsumed);
 		pIeLen = pBuf;
 		++pBuf; --nBuf; ++(*pnConsumed);
-		*pBuf = 94;
+		*pBuf = 107;
 		++pBuf; --nBuf; ++(*pnConsumed);
 		tmp212__ = 0U;
 		tmp212__ |= (pSrc->type << 0);