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

P2P: Support driver preferred freq list for invitation case

Browse source 
When using P2P invitation to re-invoke a persistent P2P group without
specifying the operating channel, query the driver for the preferred
frequency list, and use it to select the operating channel of the group.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Ahmad Kholaif 2015-08-10 18:09:27 -07:00 committed by Jouni Malinen
parent de2a7b796d
commit fbcddaed9a
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p2p/p2p_go_neg.c
View file

@ -673,8 +673,8 @@ static void p2p_check_pref_chan_recv(struct p2p_data *p2p, int go,
} }
static void p2p_check_pref_chan(struct p2p_data *p2p, int go, void p2p_check_pref_chan(struct p2p_data *p2p, int go,
struct p2p_device *dev, struct p2p_message *msg) struct p2p_device *dev, struct p2p_message *msg)
{ {
unsigned int freq_list[P2P_MAX_PREF_CHANNELS], size; unsigned int freq_list[P2P_MAX_PREF_CHANNELS], size;
unsigned int i; unsigned int i;
@ -725,7 +725,7 @@ static void p2p_check_pref_chan(struct p2p_data *p2p, int go,
/* /*
Check if peer's preferred channel list is Check if peer's preferred channel list is
* _not_ included in the GO Negotiation Request. * _not_ included in the GO Negotiation Request or Invitation Request.
*/ */
if (msg->pref_freq_list_len == 0) if (msg->pref_freq_list_len == 0)
p2p_check_pref_chan_no_recv(p2p, go, dev, msg, freq_list, size); p2p_check_pref_chan_no_recv(p2p, go, dev, msg, freq_list, size);

2
src/p2p/p2p_i.h
View file

@ -803,6 +803,8 @@ int p2p_connect_send(struct p2p_data *p2p, struct p2p_device *dev);
u16 p2p_wps_method_pw_id(enum p2p_wps_method wps_method); u16 p2p_wps_method_pw_id(enum p2p_wps_method wps_method);
void p2p_reselect_channel(struct p2p_data *p2p, void p2p_reselect_channel(struct p2p_data *p2p,
struct p2p_channels *intersection); struct p2p_channels *intersection);
void p2p_check_pref_chan(struct p2p_data *p2p, int go,
struct p2p_device *dev, struct p2p_message *msg);
/* p2p_pd.c */ /* p2p_pd.c */
void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa,

15
src/p2p/p2p_invitation.c
View file

@ -85,6 +85,9 @@ static struct wpabuf * p2p_build_invitation_req(struct p2p_data *p2p,
p2p_buf_add_device_info(buf, p2p, peer); p2p_buf_add_device_info(buf, p2p, peer);
p2p_buf_update_ie_hdr(buf, len); p2p_buf_update_ie_hdr(buf, len);
p2p_buf_add_pref_channel_list(buf, p2p->pref_freq_list,
p2p->num_pref_freq);
#ifdef CONFIG_WIFI_DISPLAY #ifdef CONFIG_WIFI_DISPLAY
if (wfd_ie) if (wfd_ie)
wpabuf_put_buf(buf, wfd_ie); wpabuf_put_buf(buf, wfd_ie);
@ -343,6 +346,12 @@ void p2p_process_invitation_req(struct p2p_data *p2p, const u8 *sa,
p2p_reselect_channel(p2p, &intersection); p2p_reselect_channel(p2p, &intersection);
} }
/*
* Use the driver preferred frequency list extension if
* supported.
*/
p2p_check_pref_chan(p2p, go, dev, &msg);
op_freq = p2p_channel_to_freq(p2p->op_reg_class, op_freq = p2p_channel_to_freq(p2p->op_reg_class,
p2p->op_channel); p2p->op_channel);
if (op_freq < 0) { if (op_freq < 0) {
@ -534,6 +543,12 @@ void p2p_process_invitation_resp(struct p2p_data *p2p, const u8 *sa,
peer_oper_freq = 0; peer_oper_freq = 0;
} }
/*
* Use the driver preferred frequency list extension if
* supported.
*/
p2p_check_pref_chan(p2p, 0, dev, &msg);
p2p->cfg->invitation_result(p2p->cfg->cb_ctx, *msg.status, p2p->cfg->invitation_result(p2p->cfg->cb_ctx, *msg.status,
msg.group_bssid, channels, sa, msg.group_bssid, channels, sa,
freq, peer_oper_freq); freq, peer_oper_freq);

1
wpa_supplicant/p2p_supplicant.c
View file

@ -6488,6 +6488,7 @@ int wpas_p2p_invite(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
pref_freq_list, &size); pref_freq_list, &size);
if (res) if (res)
return res; return res;
p2p_set_own_pref_freq_list(wpa_s->global->p2p, pref_freq_list, size);
if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL) if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL)
return -1; return -1;