Fix some VHT Capabilities definitions

VHT_CAP_BEAMFORMEE_STS_MAX, VHT_CAP_SOUNDING_DIMENSION_OFFSET, and
VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT were not defined properly (wrong
name/size). Fix that and update the hostapd.conf parsing accordingly.

Signed-hostap: Eliad Peller <eliadx.peller@intel.com>

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 35ea3b164e3bcab73052a9ae86586506ef2c9acf..0b05ab25ab8f721871332718c7f2375003a9e595 100644 (file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1064,11 +1064,11 @@ static int hostapd_config_vht_capab(struct hostapd_config *conf,
        if (os_strstr(capab, "[SU-BEAMFORMEE]"))
                conf->vht_capab |= VHT_CAP_SU_BEAMFORMEE_CAPABLE;
        if (os_strstr(capab, "[BF-ANTENNA-2]") &&
-           (conf->vht_capab & VHT_CAP_MU_BEAMFORMER_CAPABLE))
-               conf->vht_capab |= VHT_CAP_BEAMFORMER_ANTENNAS_MAX;
+           (conf->vht_capab & VHT_CAP_SU_BEAMFORMEE_CAPABLE))
+               conf->vht_capab |= (1 << VHT_CAP_BEAMFORMEE_STS_OFFSET);
        if (os_strstr(capab, "[SOUNDING-DIMENSION-2]") &&
-           (conf->vht_capab & VHT_CAP_MU_BEAMFORMER_CAPABLE))
-               conf->vht_capab |= VHT_CAP_SOUNDING_DIMENTION_MAX;
+           (conf->vht_capab & VHT_CAP_SU_BEAMFORMER_CAPABLE))
+               conf->vht_capab |= (1 << VHT_CAP_SOUNDING_DIMENSION_OFFSET);
        if (os_strstr(capab, "[MU-BEAMFORMER]"))
                conf->vht_capab |= VHT_CAP_MU_BEAMFORMER_CAPABLE;
        if (os_strstr(capab, "[MU-BEAMFORMEE]"))

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index ca38701bf02ac31b27157f1e223c5c206c30425e..12bf92db0cbd18a250db4236ea75436c4af9608f 100644 (file)
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -716,13 +716,18 @@ struct ieee80211_vht_operation {
 #define VHT_CAP_RXSTBC_4                            ((u32) BIT(10))
 #define VHT_CAP_SU_BEAMFORMER_CAPABLE               ((u32) BIT(11))
 #define VHT_CAP_SU_BEAMFORMEE_CAPABLE               ((u32) BIT(12))
-#define VHT_CAP_BEAMFORMER_ANTENNAS_MAX             ((u32) BIT(13) | BIT(14))
-#define VHT_CAP_SOUNDING_DIMENTION_MAX              ((u32) BIT(16) | BIT(17))
+#define VHT_CAP_BEAMFORMEE_STS_MAX                  ((u32) BIT(13) | \
+                                                          BIT(14) | BIT(15))
+#define VHT_CAP_BEAMFORMEE_STS_OFFSET               13
+#define VHT_CAP_SOUNDING_DIMENSION_MAX              ((u32) BIT(16) | \
+                                                          BIT(17) | BIT(18))
+#define VHT_CAP_SOUNDING_DIMENSION_OFFSET           16
 #define VHT_CAP_MU_BEAMFORMER_CAPABLE               ((u32) BIT(19))
 #define VHT_CAP_MU_BEAMFORMEE_CAPABLE               ((u32) BIT(20))
 #define VHT_CAP_VHT_TXOP_PS                         ((u32) BIT(21))
 #define VHT_CAP_HTC_VHT                             ((u32) BIT(22))
-#define VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT          ((u32) BIT(23))
+#define VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT          ((u32) BIT(23) | \
+                                                          BIT(24) | BIT(25))
 #define VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB   ((u32) BIT(27))
 #define VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB     ((u32) BIT(26) | BIT(27))
 #define VHT_CAP_RX_ANTENNA_PATTERN                  ((u32) BIT(28))