DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

P2P: Clear unexpected HT40 configuration on 2.4 GHz band

Browse source 
Number of the P2P+NFC test cases have been failing every now and then
and those failures seemed to be because of having somehow managed to
select the GO's operating channel as HT40+ on the channel 11 in the 2.4
GHz band, i.e., something that is clearly incorrect. The P2P check for
HT40 secondary channel is supported only on the 5 GHz band, so drop HT40
configuration if it shows up unexpectedly on the 2.4 GHz band to avoid
issues in GO being able to start.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2021-02-14 19:32:23 +02:00
parent 6b59e63f0e
commit 6fb6264129
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/ap.c
View file

@ -266,6 +266,16 @@ int wpa_supplicant_conf_ap_ht(struct wpa_supplicant *wpa_s,
wpa_printf(MSG_DEBUG,
"HT secondary channel offset %d for P2P group",
conf->secondary_channel);
} else if (ssid->p2p_group && conf->secondary_channel &&
conf->hw_mode != HOSTAPD_MODE_IEEE80211A) {
/* This ended up trying to configure invalid
* 2.4 GHz channels (e.g., HT40+ on channel 11)
* in some cases, so clear the secondary channel
* configuration now to avoid such cases that
* would lead to group formation failures. */
wpa_printf(MSG_DEBUG,
"Disable HT secondary channel for P2P group on 2.4 GHz");
conf->secondary_channel = 0;
}
#endif /* CONFIG_P2P */