Patchwork P2P: Set Concurrent Operation bit in Beacon/Probe Response

login
register
mail settings
Submitter Masashi Honma
Date June 5, 2012, 11:04 p.m.
Message ID <CAFk-A4=hcfBc2m=oMwKwxbAs9iGUtmeh_L0nEzagQa-2uLcgxQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/163188/
State Accepted
Commit 135b69cc7a4af72c386a6c5cd2b321b20ce6b19a
Headers show

Comments

Masashi Honma - June 5, 2012, 11:04 p.m.
2012/6/6 Jouni Malinen <j@w1.fi>:
>
> It looks fine to add this Device Capability into the Beacon/Probe
> Response frames from the GO. Could you please re-send the patch with
> Signed-hostap: line so that I can apply it? Though, it would likely be
> even better to initialize dev_capab to group->p2p->dev_capab in
> p2p_group_add_common_ies() to remain consistent with how this is set in
> p2p_init().

OK. This is the new one.

Signed-hostap: Masashi Honma <masashi.honma@gmail.com>

 		group_capab |= P2P_GROUP_CAPAB_PERSISTENT_GROUP;


Regards,
Masashi Honma.
Jouni Malinen - June 6, 2012, 9:59 a.m.
On Wed, Jun 06, 2012 at 08:04:06AM +0900, Masashi Honma wrote:
> OK. This is the new one.

Thanks! Applied.

Patch

diff --git a/src/p2p/p2p_group.c b/src/p2p/p2p_group.c
index 44b387a..8d4a3cb 100644
--- a/src/p2p/p2p_group.c
+++ b/src/p2p/p2p_group.c
@@ -135,11 +135,10 @@  static void p2p_client_info(struct wpabuf *ie,
struct p2p_group_member *m)
 static void p2p_group_add_common_ies(struct p2p_group *group,
 				     struct wpabuf *ie)
 {
-	u8 dev_capab = 0, group_capab = 0;
+	u8 dev_capab = group->p2p->dev_capab, group_capab = 0;

 	/* P2P Capability */
-	dev_capab |= P2P_DEV_CAPAB_SERVICE_DISCOVERY;
-	dev_capab |= P2P_DEV_CAPAB_INVITATION_PROCEDURE;
+	dev_capab &= ~P2P_DEV_CAPAB_CLIENT_DISCOVERABILITY;
 	group_capab |= P2P_GROUP_CAPAB_GROUP_OWNER;
 	if (group->cfg->persistent_group) {