浏览代码

qcacld-3.0: Change BSS_COLOR_CHANGE IE to Ext IE

Change BSS_COLOR_CHANGE IE to Ext IE

Change-Id: I687eedca3bb2a527409e29163d5f8e4af100b6fe
CRs-Fixed: 2179270
Arif Hussain 7 年之前
父节点
当前提交
3a30fdcfe6
共有 3 个文件被更改,包括 21 次插入27 次删除
  1. 1 1
      core/mac/src/cfg/cfgUtil/dot11f.frms
  2. 5 5
      core/mac/src/include/dot11f.h
  3. 15 21
      core/mac/src/sys/legacy/src/utils/src/dot11f.c

+ 1 - 1
core/mac/src/cfg/cfgUtil/dot11f.frms

@@ -3006,7 +3006,7 @@ IE mu_edca_param_set (EID_VENDOR_SPECIFIC) OUI (0x00, 0x13, 0x74, 0x04)
     acvo_muedca_timer, 1;
 }
 
-IE bss_color_change(EID_VENDOR_SPECIFIC) OUI (0x00, 0x13, 0x74, 0x05)
+IE bss_color_change (EID_EXTN_ID_ELEMENT) OUI (0x2A)
 {
     countdown, 1;
     {

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

@@ -35,7 +35,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Thu Jan 25 11:13:36 2018 from the following file(s):
+ * Thu Feb  8 19:55:19 2018 from the following file(s):
  *
  * dot11f.frms
  *
@@ -8138,7 +8138,7 @@ uint32_t dot11f_get_packed_ie_addba_extn_element(
 }; /* End extern "C". */
 #endif /* C++ */
 
-/* EID 221 (0xdd) {OUI 0x00, 0x13, 0x74, 0x05} */
+/* EID 255 (0xff) Extended EID 42 (0x2a) */
 typedef struct sDot11fIEbss_color_change {
 	uint8_t             present;
 	uint8_t             countdown;
@@ -8146,12 +8146,12 @@ typedef struct sDot11fIEbss_color_change {
 	uint8_t             reserved:2;
 } tDot11fIEbss_color_change;
 
-#define DOT11F_EID_BSS_COLOR_CHANGE (221)
+#define DOT11F_EID_BSS_COLOR_CHANGE (255)
 
 /* N.B. These #defines do *not* include the EID & length */
-#define DOT11F_IE_BSS_COLOR_CHANGE_MIN_LEN (6)
+#define DOT11F_IE_BSS_COLOR_CHANGE_MIN_LEN (2)
 
-#define DOT11F_IE_BSS_COLOR_CHANGE_MAX_LEN (6)
+#define DOT11F_IE_BSS_COLOR_CHANGE_MAX_LEN (2)
 
 #ifdef __cplusplus
 extern "C" {

+ 15 - 21
core/mac/src/sys/legacy/src/utils/src/dot11f.c

@@ -33,7 +33,7 @@
  *
  *
  * This file was automatically generated by 'framesc'
- * Fri Jan 26 11:15:52 2018 from the following file(s):
+ * Thu Feb  8 19:55:19 2018 from the following file(s):
  *
  * dot11f.frms
  *
@@ -7449,8 +7449,8 @@ static const tIEDefn IES_AssocResponse[] = {
 	0, DOT11F_EID_HE_OP, 36, 0, },
 	{ offsetof(tDot11fAssocResponse, bss_color_change),
 	offsetof(tDot11fIEbss_color_change, present), 0, "bss_color_change",
-	0, 8, 8, SigIebss_color_change, {0, 19, 116, 5, 0},
-	4, DOT11F_EID_BSS_COLOR_CHANGE, 0, 0, },
+	0, 4, 4, SigIebss_color_change, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_BSS_COLOR_CHANGE, 42, 0, },
 	{ offsetof(tDot11fAssocResponse, mu_edca_param_set),
 	offsetof(tDot11fIEmu_edca_param_set, present), 0, "mu_edca_param_set",
 	0, 19, 19, SigIemu_edca_param_set, {0, 19, 116, 4, 0},
@@ -7742,8 +7742,8 @@ static const tIEDefn IES_Beacon[] = {
 	0, DOT11F_EID_HE_OP, 36, 0, },
 	{ offsetof(tDot11fBeacon, bss_color_change),
 	offsetof(tDot11fIEbss_color_change, present), 0, "bss_color_change",
-	0, 8, 8, SigIebss_color_change, {0, 19, 116, 5, 0},
-	4, DOT11F_EID_BSS_COLOR_CHANGE, 0, 0, },
+	0, 4, 4, SigIebss_color_change, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_BSS_COLOR_CHANGE, 42, 0, },
 	{ offsetof(tDot11fBeacon, mu_edca_param_set),
 	offsetof(tDot11fIEmu_edca_param_set, present), 0, "mu_edca_param_set",
 	0, 19, 19, SigIemu_edca_param_set, {0, 19, 116, 4, 0},
@@ -7968,8 +7968,8 @@ static const tIEDefn IES_Beacon2[] = {
 	0, DOT11F_EID_HE_OP, 36, 0, },
 	{ offsetof(tDot11fBeacon2, bss_color_change),
 	offsetof(tDot11fIEbss_color_change, present), 0, "bss_color_change",
-	0, 8, 8, SigIebss_color_change, {0, 19, 116, 5, 0},
-	4, DOT11F_EID_BSS_COLOR_CHANGE, 0, 0, },
+	0, 4, 4, SigIebss_color_change, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_BSS_COLOR_CHANGE, 42, 0, },
 	{ offsetof(tDot11fBeacon2, mu_edca_param_set),
 	offsetof(tDot11fIEmu_edca_param_set, present), 0, "mu_edca_param_set",
 	0, 19, 19, SigIemu_edca_param_set, {0, 19, 116, 4, 0},
@@ -8194,8 +8194,8 @@ static const tIEDefn IES_BeaconIEs[] = {
 	0, DOT11F_EID_HE_OP, 36, 0, },
 	{ offsetof(tDot11fBeaconIEs, bss_color_change),
 	offsetof(tDot11fIEbss_color_change, present), 0, "bss_color_change",
-	0, 8, 8, SigIebss_color_change, {0, 19, 116, 5, 0},
-	4, DOT11F_EID_BSS_COLOR_CHANGE, 0, 0, },
+	0, 4, 4, SigIebss_color_change, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_BSS_COLOR_CHANGE, 42, 0, },
 	{ offsetof(tDot11fBeaconIEs, mu_edca_param_set),
 	offsetof(tDot11fIEmu_edca_param_set, present), 0, "mu_edca_param_set",
 	0, 19, 19, SigIemu_edca_param_set, {0, 19, 116, 4, 0},
@@ -8839,8 +8839,8 @@ static const tIEDefn IES_ProbeResponse[] = {
 	0, DOT11F_EID_HE_OP, 36, 0, },
 	{ offsetof(tDot11fProbeResponse, bss_color_change),
 	offsetof(tDot11fIEbss_color_change, present), 0, "bss_color_change",
-	0, 8, 8, SigIebss_color_change, {0, 19, 116, 5, 0},
-	4, DOT11F_EID_BSS_COLOR_CHANGE, 0, 0, },
+	0, 4, 4, SigIebss_color_change, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_BSS_COLOR_CHANGE, 42, 0, },
 	{ offsetof(tDot11fProbeResponse, mu_edca_param_set),
 	offsetof(tDot11fIEmu_edca_param_set, present), 0, "mu_edca_param_set",
 	0, 19, 19, SigIemu_edca_param_set, {0, 19, 116, 4, 0},
@@ -9238,8 +9238,8 @@ static const tIEDefn IES_ReAssocResponse[] = {
 	0, DOT11F_EID_HE_OP, 36, 0, },
 	{ offsetof(tDot11fReAssocResponse, bss_color_change),
 	offsetof(tDot11fIEbss_color_change, present), 0, "bss_color_change",
-	0, 8, 8, SigIebss_color_change, {0, 19, 116, 5, 0},
-	4, DOT11F_EID_BSS_COLOR_CHANGE, 0, 0, },
+	0, 4, 4, SigIebss_color_change, {0, 0, 0, 0, 0},
+	0, DOT11F_EID_BSS_COLOR_CHANGE, 42, 0, },
 	{ offsetof(tDot11fReAssocResponse, mu_edca_param_set),
 	offsetof(tDot11fIEmu_edca_param_set, present), 0, "mu_edca_param_set",
 	0, 19, 19, SigIemu_edca_param_set, {0, 19, 116, 4, 0},
@@ -22912,17 +22912,11 @@ uint32_t dot11f_pack_ie_bss_color_change(tpAniSirGlobal pCtx,
 	while (pSrc->present) {
 		if (nNeeded > nBuf)
 			return DOT11F_BUFFER_OVERFLOW;
-		*pBuf = 221;
+		*pBuf = 255;
 		++pBuf; ++(*pnConsumed);
 		pIeLen = pBuf;
 		++pBuf; ++(*pnConsumed);
-		*pBuf = 0x0;
-		++pBuf; ++(*pnConsumed);
-		*pBuf = 0x13;
-		++pBuf; ++(*pnConsumed);
-		*pBuf = 0x74;
-		++pBuf; ++(*pnConsumed);
-		*pBuf = 0x5;
+		*pBuf = 42;
 		++pBuf; ++(*pnConsumed);
 		*pBuf = pSrc->countdown;
 		*pnConsumed += 1;