wlan: Updating VHT cap IE for SU Beamformee capability bits and correcting VHT Basic MCS set in VHT OP IE.
We do not support SU Beamformee. Updating the VHT cap IE for this.
VHT Basic MCS set in VHT operation IE was set to 0x2 leaving the
remaining bits of the 16 bit field as 0 informing that the device
supports MCS 0-7 for rest of the spatial streams.
Correcting this to 0xFFFE so that only single spatial stream is valid
with a value of 2 (MCS 0-9) and rest of the spatial streams are not
supported.
Change-Id: I982008b1d080daaaabf48c40e128ad9eebce6417
CR-Fixed: 420622
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index 178ba8d..1ee1b59 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -1601,11 +1601,11 @@
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STAMIN 0
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STAMAX 1
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STADEF 1
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STADEF 0
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_APMIN 0
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_APMAX 1
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_APDEF 1
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_APDEF 0
#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMIN 0
#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX 1
@@ -1617,11 +1617,11 @@
#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STAMIN 0
#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STAMAX 1
-#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STADEF 1
+#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STADEF 0
#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_APMIN 0
#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_APMAX 1
-#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_APDEF 1
+#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_APDEF 0
#define WNI_CFG_VHT_MU_BEAMFORMER_CAP_STAMIN 0
#define WNI_CFG_VHT_MU_BEAMFORMER_CAP_STAMAX 1
@@ -1749,12 +1749,12 @@
#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_APDEF 0
#define WNI_CFG_VHT_BASIC_MCS_SET_STAMIN 0
-#define WNI_CFG_VHT_BASIC_MCS_SET_STAMAX 3
-#define WNI_CFG_VHT_BASIC_MCS_SET_STADEF 0
+#define WNI_CFG_VHT_BASIC_MCS_SET_STAMAX 65535
+#define WNI_CFG_VHT_BASIC_MCS_SET_STADEF 65534
#define WNI_CFG_VHT_BASIC_MCS_SET_APMIN 0
-#define WNI_CFG_VHT_BASIC_MCS_SET_APMAX 3
-#define WNI_CFG_VHT_BASIC_MCS_SET_APDEF 0
+#define WNI_CFG_VHT_BASIC_MCS_SET_APMAX 65535
+#define WNI_CFG_VHT_BASIC_MCS_SET_APDEF 65534
#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT_STAMIN 0
#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT_STAMAX 4
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index a34444f..bd74d3c 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -1122,7 +1122,7 @@
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STAMIN 0
#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STAMAX 1
-#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STADEF 1
+#define WNI_CFG_VHT_SU_BEAMFORMEE_CAP_STADEF 0
#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMIN 0
#define WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED_STAMAX 1
@@ -1130,7 +1130,7 @@
#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STAMIN 0
#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STAMAX 1
-#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STADEF 1
+#define WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS_STADEF 0
#define WNI_CFG_VHT_MU_BEAMFORMER_CAP_STAMIN 0
#define WNI_CFG_VHT_MU_BEAMFORMER_CAP_STAMAX 1
@@ -1198,8 +1198,8 @@
#define WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2_STADEF 0
#define WNI_CFG_VHT_BASIC_MCS_SET_STAMIN 0
-#define WNI_CFG_VHT_BASIC_MCS_SET_STAMAX 3
-#define WNI_CFG_VHT_BASIC_MCS_SET_STADEF 0
+#define WNI_CFG_VHT_BASIC_MCS_SET_STAMAX 65535
+#define WNI_CFG_VHT_BASIC_MCS_SET_STADEF 65534
#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT_STAMIN 0
#define WNI_CFG_VHT_MU_MIMO_CAP_STA_COUNT_STAMAX 4
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index 09fd22a..a509b6f 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -2813,10 +2813,10 @@
WNI_CFG_VHT_SU_BEAMFORMEE_CAP I 4 19
V RW NP
LIM
-0 1 1
+0 1 0
V RW NP
LIM
-0 1 1
+0 1 0
*
* Compressed Steering Number of Beamformer Antennas Supported
@@ -2838,10 +2838,10 @@
WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS I 4 19
V RW NP
LIM
-0 1 1
+0 1 0
V RW NP
LIM
-0 1 1
+0 1 0
*
* MU Beamformer Capable
@@ -3029,10 +3029,10 @@
WNI_CFG_VHT_BASIC_MCS_SET I 4 19
V RW NP
LIM
-0 3 0
+0 0xFFFF 0xFFFE
V RW NP
LIM
-0 3 0
+0 0xFFFF 0xFFFE
*
* MU-MIMO Capable STA Count
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index 7b27eab..9ea58db 100644
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat
Binary files differ