From 5972dc73c112eca8decc81a9461c2ceadfe4c72b Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Wed, 15 Feb 2017 19:07:02 +0900 Subject: [PATCH] mesh: Use correct rate in VHT and HT mixed environment Let mesh STA A be a STA which has config disable_ht=0 and disable_vht=1. Let mesh STA B be a STA which has config disable_ht=0 and disable_vht=0. The mesh STA A and B was connected. Previously, the mesh STA A sent frame with VHT rate even though its VHT was disabled. This commit fixes the issue by checking the local BSS VHT configuration. Signed-off-by: Masashi Honma --- src/ap/ieee802_11_vht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/ieee802_11_vht.c b/src/ap/ieee802_11_vht.c index f30f63bc5..8d0662078 100644 --- a/src/ap/ieee802_11_vht.c +++ b/src/ap/ieee802_11_vht.c @@ -334,7 +334,7 @@ u16 copy_sta_vht_capab(struct hostapd_data *hapd, struct sta_info *sta, { /* Disable VHT caps for STAs associated to no-VHT BSSes. */ if (!vht_capab || - hapd->conf->disable_11ac || + !hapd->iconf->ieee80211ac || hapd->conf->disable_11ac || !check_valid_vht_mcs(hapd->iface->current_mode, vht_capab)) { sta->flags &= ~WLAN_STA_VHT; os_free(sta->vht_capabilities);