aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMasashi Honma <masashi.honma@gmail.com>2017-02-15 10:07:01 (GMT)
committerJouni Malinen <j@w1.fi>2017-02-19 14:01:17 (GMT)
commit84ea61cffefaa85b63b5a8db6f9c02818a7594e3 (patch)
treea11c09d14e5da7a42b37a47707a103a14e545875 /src
parent025c6a47fb7936599661efc4e0e61da61ed08ab3 (diff)
downloadhostap-84ea61cffefaa85b63b5a8db6f9c02818a7594e3.zip
hostap-84ea61cffefaa85b63b5a8db6f9c02818a7594e3.tar.gz
hostap-84ea61cffefaa85b63b5a8db6f9c02818a7594e3.tar.bz2
mesh: Use correct rate in HT and legacy mixed environment
Let mesh STA A be a STA which has config disable_ht=1. Let mesh STA B be a STA which has config disable_ht=0. The mesh STA A and B was connected. Previously, the mesh STA A sent frame with HT rate even though its HT was disabled. This commit fixes the issue by checking the local BSS HT configuration. Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/ap/ieee802_11_ht.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
index 5eb1060..146e447 100644
--- a/src/ap/ieee802_11_ht.c
+++ b/src/ap/ieee802_11_ht.c
@@ -340,8 +340,8 @@ u16 copy_sta_ht_capab(struct hostapd_data *hapd, struct sta_info *sta,
* that did not specify a valid WMM IE in the (Re)Association Request
* frame.
*/
- if (!ht_capab ||
- !(sta->flags & WLAN_STA_WMM) || hapd->conf->disable_11n) {
+ if (!ht_capab || !(sta->flags & WLAN_STA_WMM) ||
+ !hapd->iconf->ieee80211n || hapd->conf->disable_11n) {
sta->flags &= ~WLAN_STA_HT;
os_free(sta->ht_capabilities);
sta->ht_capabilities = NULL;