Allow HT 40 MHz intolerant flag to be set for association

This extends HT overrides to allow HT 40 MHz intolerant flag to be set
with ht40_intolerant=1.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2014-04-15 17:22:47 +03:00 committed by Jouni Malinen
parent 6d99bd8076
commit d41cc8ccf6
4 changed files with 16 additions and 0 deletions

View File

@ -1702,6 +1702,7 @@ static const struct parse_data ssid_fields[] = {
{ INT_RANGE(disable_ht40, -1, 1) },
{ INT_RANGE(disable_sgi, 0, 1) },
{ INT_RANGE(disable_ldpc, 0, 1) },
{ INT_RANGE(ht40_intolerant, 0, 1) },
{ INT_RANGE(disable_max_amsdu, -1, 1) },
{ INT_RANGE(ampdu_factor, -1, 3) },
{ INT_RANGE(ampdu_density, -1, 7) },

View File

@ -533,6 +533,11 @@ struct wpa_ssid {
*/
int disable_ldpc;
/**
* ht40_intolerant - Indicate 40 MHz intolerant for this network
*/
int ht40_intolerant;
/**
* disable_max_amsdu - Disable MAX A-MSDU
*

View File

@ -2967,6 +2967,12 @@ void wpa_supplicant_apply_ht_overrides(
wpa_set_disable_ht40(wpa_s, htcaps, htcaps_mask, ssid->disable_ht40);
wpa_set_disable_sgi(wpa_s, htcaps, htcaps_mask, ssid->disable_sgi);
wpa_set_disable_ldpc(wpa_s, htcaps, htcaps_mask, ssid->disable_ldpc);
if (ssid->ht40_intolerant) {
u16 bit = host_to_le16(HT_CAP_INFO_40MHZ_INTOLERANT);
htcaps->ht_capabilities_info |= bit;
htcaps_mask->ht_capabilities_info |= bit;
}
}
#endif /* CONFIG_HT_OVERRIDES */

View File

@ -951,6 +951,10 @@ fast_reauth=1
# 0 = LDPC enabled (if AP supports it)
# 1 = LDPC disabled
#
# ht40_intolerant: Whether 40 MHz intolerant should be indicated.
# 0 = 40 MHz tolerant (default)
# 1 = 40 MHz intolerant
#
# ht_mcs: Configure allowed MCS rates.
# Parsed as an array of bytes, in base-16 (ascii-hex)
# ht_mcs="" // Use all available (default)