From 1dde5b5cddd5384c0b11f81ff02f50bcf65f98c6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 7 Apr 2014 22:02:14 +0300 Subject: [PATCH] Remove PSMP option from ht_capab This was used to fill in the "PSMP support" subfield that was defined during P802.11n development. However, this subfield was marked reserved in the published IEEE Std 802.11n-2009 and it is not supported by current drivers that use hostapd for SME either. As such, there is not much point in maintaining this field as ht_capab parameter within hostapd either. Signed-off-by: Jouni Malinen --- hostapd/config_file.c | 2 -- hostapd/hostapd.conf | 1 - src/ap/hw_features.c | 6 ------ src/common/ieee802_11_defs.h | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/hostapd/config_file.c b/hostapd/config_file.c index 6ad1ca7ae..5f8428105 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -1069,8 +1069,6 @@ static int hostapd_config_ht_capab(struct hostapd_config *conf, conf->ht_capab |= HT_CAP_INFO_MAX_AMSDU_SIZE; if (os_strstr(capab, "[DSSS_CCK-40]")) conf->ht_capab |= HT_CAP_INFO_DSSS_CCK40MHZ; - if (os_strstr(capab, "[PSMP]")) - conf->ht_capab |= HT_CAP_INFO_PSMP_SUPP; if (os_strstr(capab, "[40-INTOLERANT]")) conf->ht_capab |= HT_CAP_INFO_40MHZ_INTOLERANT; if (os_strstr(capab, "[LSIG-TXOP-PROT]")) diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf index 5012fbc9d..a7ab0f6bc 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -480,7 +480,6 @@ wmm_ac_vo_acm=0 # Maximum A-MSDU length: [MAX-AMSDU-7935] for 7935 octets (3839 octets if not # set) # DSSS/CCK Mode in 40 MHz: [DSSS_CCK-40] = allowed (not allowed if not set) -# PSMP support: [PSMP] (disabled if not set) # 40 MHz intolerant [40-INTOLERANT] (not advertised if not set) # L-SIG TXOP protection support: [LSIG-TXOP-PROT] (disabled if not set) #ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40] diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c index 54a79b09d..3cf479a17 100644 --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c @@ -679,12 +679,6 @@ static int ieee80211n_supported_ht_capab(struct hostapd_iface *iface) return 0; } - if ((conf & HT_CAP_INFO_PSMP_SUPP) && !(hw & HT_CAP_INFO_PSMP_SUPP)) { - wpa_printf(MSG_ERROR, "Driver does not support configured " - "HT capability [PSMP]"); - return 0; - } - if ((conf & HT_CAP_INFO_LSIG_TXOP_PROTECT_SUPPORT) && !(hw & HT_CAP_INFO_LSIG_TXOP_PROTECT_SUPPORT)) { wpa_printf(MSG_ERROR, "Driver does not support configured " diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h index 6f2173d78..4b6f13c2a 100644 --- a/src/common/ieee802_11_defs.h +++ b/src/common/ieee802_11_defs.h @@ -658,7 +658,7 @@ struct ieee80211_vht_operation { #define HT_CAP_INFO_DELAYED_BA ((u16) BIT(10)) #define HT_CAP_INFO_MAX_AMSDU_SIZE ((u16) BIT(11)) #define HT_CAP_INFO_DSSS_CCK40MHZ ((u16) BIT(12)) -#define HT_CAP_INFO_PSMP_SUPP ((u16) BIT(13)) +/* B13 - Reserved (was PSMP support during P802.11n development) */ #define HT_CAP_INFO_40MHZ_INTOLERANT ((u16) BIT(14)) #define HT_CAP_INFO_LSIG_TXOP_PROTECT_SUPPORT ((u16) BIT(15))