diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-09-23 19:11:37 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2012-09-23 19:11:37 -0700 |
| commit | f06196652a3e12af00503f4a548c56d4e60f7246 (patch) | |
| tree | 2899c545fb49846316e84accbea99c1722ad399e /src/p2p/p2p_invitation.c | |
| parent | af84a575044f6556994fcc124a955fc0ac0a6736 (diff) | |
| download | external_wpa_supplicant_8-f06196652a3e12af00503f4a548c56d4e60f7246.zip external_wpa_supplicant_8-f06196652a3e12af00503f4a548c56d4e60f7246.tar.gz external_wpa_supplicant_8-f06196652a3e12af00503f4a548c56d4e60f7246.tar.bz2 | |
Fix build: Add ANDROID_P2P for SCC interop fixes
Change-Id: I847b63428b47016cf9a9a0b090636e1d5b9d28b8
Diffstat (limited to 'src/p2p/p2p_invitation.c')
| -rw-r--r-- | src/p2p/p2p_invitation.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/p2p/p2p_invitation.c b/src/p2p/p2p_invitation.c index b237cf8..785200c 100644 --- a/src/p2p/p2p_invitation.c +++ b/src/p2p/p2p_invitation.c @@ -66,13 +66,17 @@ static struct wpabuf * p2p_build_invitation_req(struct p2p_data *p2p, p2p->op_reg_class, p2p->op_channel); if (p2p->inv_bssid_set) p2p_buf_add_group_bssid(buf, p2p->inv_bssid); +#ifdef ANDROID_P2P if (p2p->cfg->p2p_concurrency == P2P_SINGLE_CHANNEL_CONCURRENT && p2p->op_channel) { wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "Forcing channel list %d", p2p->op_channel); p2p_buf_add_oper_as_channel_list(buf, p2p->cfg->country, p2p->op_reg_class, p2p->op_channel); } else { +#endif p2p_buf_add_channel_list(buf, p2p->cfg->country, &p2p->channels); +#ifdef ANDROID_P2P } +#endif if (go_dev_addr) dev_addr = go_dev_addr; else if (p2p->inv_role == P2P_INVITE_ROLE_CLIENT) @@ -139,14 +143,18 @@ static struct wpabuf * p2p_build_invitation_resp(struct p2p_data *p2p, reg_class, channel); if (group_bssid) p2p_buf_add_group_bssid(buf, group_bssid); +#ifdef ANDROID_P2P if (p2p->cfg->p2p_concurrency == P2P_SINGLE_CHANNEL_CONCURRENT && channel) { wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "Forcing channel list %d", channel); p2p_buf_add_oper_as_channel_list(buf, p2p->cfg->country, reg_class, channel); } else { +#endif if (channels) p2p_buf_add_channel_list(buf, p2p->cfg->country, channels); +#ifdef ANDROID_P2P } +#endif p2p_buf_update_ie_hdr(buf, len); #ifdef CONFIG_WIFI_DISPLAY |