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

P2P: Support preferred GO band based optimization for scanning

Browse source 
Allow specifying preferred GO band in addition to frequency. If a band
is specified, the first two scans will be limited to only non-DFS
channels to shorten scan times, and the next two will scan the entire
band.

Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
This commit is contained in:
Matthew Wang 2022-12-16 11:10:02 -08:00 committed by Jouni Malinen
parent 093bedc059
commit f9c6ab834d
3 changed files with 44 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wpa_supplicant/p2p_supplicant.c
View file

@ -342,15 +342,15 @@ void wpas_p2p_scan_freqs(struct wpa_supplicant *wpa_s,
bool include_6ghz)
{
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A,
params, false, false);
params, false, false, false);
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G,
params, false, false);
params, false, false, false);
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211AD,
params, false, false);
params, false, false, false);
if (!wpa_s->conf->p2p_6ghz_disable &&
is_p2p_allow_6ghz(wpa_s->global->p2p) && include_6ghz)
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A,
params, true, true);
params, true, true, false);
}

47
wpa_supplicant/scan.c
View file

@ -451,11 +451,36 @@ static void wpa_supplicant_optimize_freqs(
*/
if (wpa_s->p2p_in_invitation < 5 &&
wpa_s->p2p_invite_go_freq > 0) {
wpa_dbg(wpa_s, MSG_DEBUG, "P2P: Scan only GO preferred frequency %d MHz during invitation",
wpa_s->p2p_invite_go_freq);
params->freqs = os_calloc(2, sizeof(int));
if (params->freqs)
params->freqs[0] = wpa_s->p2p_invite_go_freq;
if (wpa_s->p2p_invite_go_freq == 2 ||
wpa_s->p2p_invite_go_freq == 5) {
enum hostapd_hw_mode mode;
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Scan only GO preferred band %d GHz during invitation",
wpa_s->p2p_invite_go_freq);
if (!wpa_s->hw.modes)
return;
mode = wpa_s->p2p_invite_go_freq == 5 ?
HOSTAPD_MODE_IEEE80211A :
HOSTAPD_MODE_IEEE80211G;
if (wpa_s->p2p_in_invitation <= 2)
wpa_add_scan_freqs_list(wpa_s, mode,
params, false,
false, true);
if (!params->freqs || params->freqs[0] == 0)
wpa_add_scan_freqs_list(wpa_s, mode,
params, false,
false, false);
} else {
wpa_dbg(wpa_s, MSG_DEBUG,
"P2P: Scan only GO preferred frequency %d MHz during invitation",
wpa_s->p2p_invite_go_freq);
params->freqs = os_calloc(2, sizeof(int));
if (params->freqs)
params->freqs[0] =
wpa_s->p2p_invite_go_freq;
}
}
wpa_s->p2p_in_invitation++;
if (wpa_s->p2p_in_invitation > 20) {
@ -713,7 +738,8 @@ static int non_p2p_network_enabled(struct wpa_supplicant *wpa_s)
int wpa_add_scan_freqs_list(struct wpa_supplicant *wpa_s,
enum hostapd_hw_mode band,
struct wpa_driver_scan_params *params,
bool is_6ghz, bool only_6ghz_psc)
bool is_6ghz, bool only_6ghz_psc,
bool exclude_radar)
{
/* Include only supported channels for the specified band */
struct hostapd_hw_modes *mode;
@ -738,6 +764,9 @@ int wpa_add_scan_freqs_list(struct wpa_supplicant *wpa_s,
for (i = 0; i < mode->num_channels; i++) {
if (mode->channels[i].flag & HOSTAPD_CHAN_DISABLED)
continue;
if (exclude_radar &&
(mode->channels[i].flag & HOSTAPD_CHAN_RADAR))
continue;
if (is_6ghz && only_6ghz_psc &&
!is_6ghz_psc_frequency(mode->channels[i].freq))
@ -761,13 +790,13 @@ static void wpa_setband_scan_freqs(struct wpa_supplicant *wpa_s,
if (wpa_s->setband_mask & WPA_SETBAND_5G)
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, params,
false, false);
false, false, false);
if (wpa_s->setband_mask & WPA_SETBAND_2G)
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211G, params,
false, false);
false, false, false);
if (wpa_s->setband_mask & WPA_SETBAND_6G)
wpa_add_scan_freqs_list(wpa_s, HOSTAPD_MODE_IEEE80211A, params,
true, false);
true, false, false);
}

3
wpa_supplicant/scan.h
View file

@ -92,6 +92,7 @@ void wpa_supplicant_set_default_scan_ies(struct wpa_supplicant *wpa_s);
int wpa_add_scan_freqs_list(struct wpa_supplicant *wpa_s,
enum hostapd_hw_mode band,
struct wpa_driver_scan_params *params,
bool is_6ghz, bool only_6ghz_psc);
bool is_6ghz, bool only_6ghz_psc,
bool exclude_radar);
#endif /* SCAN_H */