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

DFS offload: P2P changes for autonomous GO

Browse source 
Add P2P changes to allow bringing up P2P autonomous GO on a DFS channel
if DFS functionality is offloaded to the driver.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Ahmad Kholaif 2015-03-04 17:31:25 -08:00 committed by Jouni Malinen
parent 1e2aaffbc8
commit d7f1aa8fd7
1 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
wpa_supplicant/p2p_supplicant.c
View file

@ -22,6 +22,7 @@
#include "ap/ap_drv_ops.h" #include "ap/ap_drv_ops.h"
#include "ap/wps_hostapd.h" #include "ap/wps_hostapd.h"
#include "ap/p2p_hostapd.h" #include "ap/p2p_hostapd.h"
#include "ap/dfs.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "rsn_supp/wpa.h" #include "rsn_supp/wpa.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
@ -5927,11 +5928,22 @@ static int wpas_p2p_setup_freqs(struct wpa_supplicant *wpa_s, int freq,
else else
ret = p2p_supported_freq_cli(wpa_s->global->p2p, freq); ret = p2p_supported_freq_cli(wpa_s->global->p2p, freq);
if (!ret) { if (!ret) {
wpa_printf(MSG_DEBUG, "P2P: The forced channel " if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
"(%u MHz) is not supported for P2P uses", ieee80211_is_dfs(freq)) {
freq); /*
res = -3; * If freq is a DFS channel and DFS is offloaded
goto exit_free; * to the driver, allow P2P GO to use it.
*/
wpa_printf(MSG_DEBUG,
"P2P: The forced channel for GO (%u MHz) is DFS, and DFS is offloaded to the driver",
freq);
} else {
wpa_printf(MSG_DEBUG,
"P2P: The forced channel (%u MHz) is not supported for P2P uses",
freq);
res = -3;
goto exit_free;
}
} }
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
@ -6302,6 +6314,17 @@ static int wpas_p2p_select_go_freq(struct wpa_supplicant *wpa_s, int freq)
} }
if (freq > 0 && !p2p_supported_freq_go(wpa_s->global->p2p, freq)) { if (freq > 0 && !p2p_supported_freq_go(wpa_s->global->p2p, freq)) {
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
ieee80211_is_dfs(freq)) {
/*
* If freq is a DFS channel and DFS is offloaded to the
* driver, allow P2P GO to use it.
*/
wpa_printf(MSG_DEBUG, "P2P: "
"%s: The forced channel for GO (%u MHz) is DFS, and DFS is offloaded",
__func__, freq);
return freq;
}
wpa_printf(MSG_DEBUG, "P2P: The forced channel for GO " wpa_printf(MSG_DEBUG, "P2P: The forced channel for GO "
"(%u MHz) is not supported for P2P uses", "(%u MHz) is not supported for P2P uses",
freq); freq);
@ -6583,10 +6606,21 @@ int wpas_p2p_group_add(struct wpa_supplicant *wpa_s, int persistent_group,
return -1; return -1;
if (params.freq && if (params.freq &&
!p2p_supported_freq_go(wpa_s->global->p2p, params.freq)) { !p2p_supported_freq_go(wpa_s->global->p2p, params.freq)) {
wpa_printf(MSG_DEBUG, "P2P: The selected channel for GO " if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_DFS_OFFLOAD) &&
"(%u MHz) is not supported for P2P uses", ieee80211_is_dfs(params.freq)) {
params.freq); /*
return -1; * If freq is a DFS channel and DFS is offloaded to the
* driver, allow P2P GO to use it.
*/
wpa_printf(MSG_DEBUG,
"P2P: %s: The forced channel for GO (%u MHz) is DFS, and DFS is offloaded to driver",
__func__, params.freq);
} else {
wpa_printf(MSG_DEBUG,
"P2P: The selected channel for GO (%u MHz) is not supported for P2P uses",
params.freq);
return -1;
}
} }
p2p_go_params(wpa_s->global->p2p, &params); p2p_go_params(wpa_s->global->p2p, &params);
params.persistent_group = persistent_group; params.persistent_group = persistent_group;