jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mesh: Use correct rate in HT and legacy mixed environment

Browse source 
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>
This commit is contained in:
Masashi Honma 2017-02-15 19:07:01 +09:00 committed by Jouni Malinen
parent 025c6a47fb
commit 84ea61cffe
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ap/ieee802_11_ht.c
View file

@ -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 * that did not specify a valid WMM IE in the (Re)Association Request
* frame. * frame.
*/ */
if (!ht_capab || if (!ht_capab || !(sta->flags & WLAN_STA_WMM) ||
!(sta->flags & WLAN_STA_WMM) || hapd->conf->disable_11n) { !hapd->iconf->ieee80211n || hapd->conf->disable_11n) {
sta->flags &= ~WLAN_STA_HT; sta->flags &= ~WLAN_STA_HT;
os_free(sta->ht_capabilities); os_free(sta->ht_capabilities);
sta->ht_capabilities = NULL; sta->ht_capabilities = NULL;

3
wpa_supplicant/mesh_mpm.c
View file

@ -684,7 +684,8 @@ static struct sta_info * mesh_mpm_add_peer(struct wpa_supplicant *wpa_s,
oper = (struct ieee80211_ht_operation *) elems->ht_operation; oper = (struct ieee80211_ht_operation *) elems->ht_operation;
if (oper && if (oper &&
!(oper->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH)) { !(oper->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH) &&
sta->ht_capabilities) {
wpa_msg(wpa_s, MSG_DEBUG, MACSTR wpa_msg(wpa_s, MSG_DEBUG, MACSTR
" does not support 40 MHz bandwidth", " does not support 40 MHz bandwidth",
MAC2STR(sta->addr)); MAC2STR(sta->addr));