From ee120ff3819123d26e05cd9d3dc6647b7354e63d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 10 Jun 2015 13:41:54 +0300 Subject: [PATCH] Remove [MU-BEAMFORMEE] option from hostapd vht_capab parameter The standard hardcodes the MU Beamformee Capable subfield is hardcoded to 0 when transmitting by an AP, so there is no need to provide a configuration parameter for setting this to one. Signed-off-by: Jouni Malinen --- hostapd/config_file.c | 2 -- hostapd/hostapd.conf | 5 ----- tests/hwsim/test_ap_vht.py | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/hostapd/config_file.c b/hostapd/config_file.c index 9800ab295..d7d5a124c 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -1163,8 +1163,6 @@ static int hostapd_config_vht_capab(struct hostapd_config *conf, 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]")) - conf->vht_capab |= VHT_CAP_MU_BEAMFORMEE_CAPABLE; if (os_strstr(capab, "[VHT-TXOP-PS]")) conf->vht_capab |= VHT_CAP_VHT_TXOP_PS; if (os_strstr(capab, "[HTC-VHT]")) diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf index 1c1e43d1d..39e9792c6 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -598,11 +598,6 @@ wmm_ac_vo_acm=0 # 0 = Not supported or sent by Non-AP STA (default) # 1 = Supported # -# MU Beamformee Capable: [MU-BEAMFORMEE] -# Indicates support for operation as an MU beamformee -# 0 = Not supported or sent by AP (default) -# 1 = Supported -# # VHT TXOP PS: [VHT-TXOP-PS] # Indicates whether or not the AP supports VHT TXOP Power Save Mode # or whether or not the STA is in VHT TXOP Power Save mode diff --git a/tests/hwsim/test_ap_vht.py b/tests/hwsim/test_ap_vht.py index d20259810..d8af46e4a 100644 --- a/tests/hwsim/test_ap_vht.py +++ b/tests/hwsim/test_ap_vht.py @@ -164,7 +164,7 @@ def test_ap_vht_capab_not_supported(dev, apdev): "ieee80211n": "1", "ieee80211ac": "1", "vht_oper_chwidth": "1", - "vht_capab": "[MAX-MPDU-7991][MAX-MPDU-11454][VHT160][VHT160-80PLUS80][RXLDPC][SHORT-GI-80][SHORT-GI-160][TX-STBC-2BY1][RX-STBC-1][RX-STBC-12][RX-STBC-123][RX-STBC-1234][SU-BEAMFORMER][SU-BEAMFORMEE][BF-ANTENNA-2][SOUNDING-DIMENSION-2][MU-BEAMFORMER][MU-BEAMFORMEE][VHT-TXOP-PS][HTC-VHT][MAX-A-MPDU-LEN-EXP0][MAX-A-MPDU-LEN-EXP7][VHT-LINK-ADAPT2][VHT-LINK-ADAPT3][RX-ANTENNA-PATTERN][TX-ANTENNA-PATTERN]", + "vht_capab": "[MAX-MPDU-7991][MAX-MPDU-11454][VHT160][VHT160-80PLUS80][RXLDPC][SHORT-GI-80][SHORT-GI-160][TX-STBC-2BY1][RX-STBC-1][RX-STBC-12][RX-STBC-123][RX-STBC-1234][SU-BEAMFORMER][SU-BEAMFORMEE][BF-ANTENNA-2][SOUNDING-DIMENSION-2][MU-BEAMFORMER][VHT-TXOP-PS][HTC-VHT][MAX-A-MPDU-LEN-EXP0][MAX-A-MPDU-LEN-EXP7][VHT-LINK-ADAPT2][VHT-LINK-ADAPT3][RX-ANTENNA-PATTERN][TX-ANTENNA-PATTERN]", "vht_oper_centr_freq_seg0_idx": "42", "require_vht": "1" } hapd = hostapd.add_ap(apdev[0]['ifname'], params, wait_enabled=False)