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

mesh: Check remote peer HT Operation element

Browse source 
The remote mesh STA which had configuration disable_ht40=1 could have HT
Capabilities element which includes Supported Channel Width Set = 1
(both 20 MHz and 40 MHz operation is supported) even though it had HT
Operation element which includes STA Channel Width = 0 (20 MHz channel
width only). Previously, local peer recognized such a remote peer as 40
MHz band width enabled STA because local peer only checked HT
Capabilities element. This could cause disconnection between
disable_ht40=1 mesh STA and disable_ht40=0 mesh STA. They could
establish a mesh BSS but could not ping with ath9k_htc device. This
commit fixes the issue by refering HT Operation element.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2017-01-27 13:43:19 +09:00 committed by Jouni Malinen
parent 9eb5757a86
commit adc6a5d81a
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wpa_supplicant/mesh_mpm.c
View file

@ -11,6 +11,7 @@
#include "utils/common.h" #include "utils/common.h"
#include "utils/eloop.h" #include "utils/eloop.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/hw_features_common.h"
#include "ap/hostapd.h" #include "ap/hostapd.h"
#include "ap/sta_info.h" #include "ap/sta_info.h"
#include "ap/ieee802_11.h" #include "ap/ieee802_11.h"
@ -646,6 +647,9 @@ static struct sta_info * mesh_mpm_add_peer(struct wpa_supplicant *wpa_s,
struct mesh_conf *conf = wpa_s->ifmsh->mconf; struct mesh_conf *conf = wpa_s->ifmsh->mconf;
struct hostapd_data *data = wpa_s->ifmsh->bss[0]; struct hostapd_data *data = wpa_s->ifmsh->bss[0];
struct sta_info *sta; struct sta_info *sta;
#ifdef CONFIG_IEEE80211N
struct ieee80211_ht_operation *oper;
#endif /* CONFIG_IEEE80211N */
int ret; int ret;
if (elems->mesh_config_len >= 7 && if (elems->mesh_config_len >= 7 &&
@ -677,6 +681,16 @@ static struct sta_info * mesh_mpm_add_peer(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_IEEE80211N #ifdef CONFIG_IEEE80211N
copy_sta_ht_capab(data, sta, elems->ht_capabilities); copy_sta_ht_capab(data, sta, elems->ht_capabilities);
oper = (struct ieee80211_ht_operation *) elems->ht_operation;
if (oper &&
!(oper->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH)) {
wpa_msg(wpa_s, MSG_DEBUG, MACSTR
" does not support 40 MHz bandwidth",
MAC2STR(sta->addr));
set_disable_ht40(sta->ht_capabilities, 1);
}
update_ht_state(data, sta); update_ht_state(data, sta);
#endif /* CONFIG_IEEE80211N */ #endif /* CONFIG_IEEE80211N */