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

P2P: Allow all channels for multi-channel concurrency (no negotiation)

Browse source 
Commit 79879f4ae8 enabled all channels to
be used when negotiating channel with a driver that supports
multi-channel concurrency. Extend that to cover cases where the channel
is not being negotiated (e.g., p2p_group_add to start a GO).

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-03-14 15:38:11 +02:00 committed by Jouni Malinen
parent 4561526f83
commit a70a52c316
1 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
wpa_supplicant/p2p_supplicant.c
View file

@ -3968,18 +3968,45 @@ static int wpas_p2p_init_go_params(struct wpa_supplicant *wpa_s,
if (wpa_s->current_ssid && wpa_drv_get_bssid(wpa_s, bssid) == 0 && if (wpa_s->current_ssid && wpa_drv_get_bssid(wpa_s, bssid) == 0 &&
wpa_s->assoc_freq && !freq) { wpa_s->assoc_freq && !freq) {
wpa_printf(MSG_DEBUG, "P2P: Force GO on the channel we are " if (!p2p_supported_freq(wpa_s->global->p2p, wpa_s->assoc_freq)
"already using"); || !freq_included(channels, wpa_s->assoc_freq)) {
params->freq = wpa_s->assoc_freq; if (wpa_s->drv_flags &
if (!freq_included(channels, params->freq)) { WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT) {
wpa_printf(MSG_DEBUG, "P2P: Forced GO freq %d MHz not " wpa_printf(MSG_DEBUG, "P2P: Cannot force GO on "
"accepted", params->freq); "the channel we are already using "
"(%u MHz) - allow multi-channel "
"concurrency", wpa_s->assoc_freq);
} else {
wpa_printf(MSG_DEBUG, "P2P: Cannot force GO on "
"the channel we are already using "
"(%u MHz)", wpa_s->assoc_freq);
return -1; return -1;
} }
} else {
wpa_printf(MSG_DEBUG, "P2P: Force GO on the channel we "
"are already using (%u MHz)",
wpa_s->assoc_freq);
params->freq = wpa_s->assoc_freq;
}
} }
res = wpa_drv_shared_freq(wpa_s); res = wpa_drv_shared_freq(wpa_s);
if (res > 0 && !freq) { if (res > 0 && !freq &&
(!p2p_supported_freq(wpa_s->global->p2p, res) ||
!freq_included(channels, res))) {
if (wpa_s->drv_flags &
WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT) {
wpa_printf(MSG_DEBUG, "P2P: Cannot force GO on the "
"channel we are already using on a shared "
"interface (%u MHz) - allow multi-channel "
"concurrency", res);
} else {
wpa_printf(MSG_DEBUG, "P2P: Cannot force GO on the "
"channel we are already using on a shared "
"interface (%u MHz)", res);
return -1;
}
} else if (res > 0 && !freq) {
wpa_printf(MSG_DEBUG, "P2P: Force GO on the channel we are " wpa_printf(MSG_DEBUG, "P2P: Force GO on the channel we are "
"already using on a shared interface"); "already using on a shared interface");
params->freq = res; params->freq = res;