From patchwork Tue Jun 5 23:04:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 163188 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 7C154B6F13 for ; Wed, 6 Jun 2012 09:04:20 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id B24729D2AE; Tue, 5 Jun 2012 19:04:17 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T2PIisVrOxcD; Tue, 5 Jun 2012 19:04:17 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id A65299D2BB; Tue, 5 Jun 2012 19:04:13 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id B3CF79D2BB for ; Tue, 5 Jun 2012 19:04:11 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UH8vGVM4cK1T for ; Tue, 5 Jun 2012 19:04:08 -0400 (EDT) Received: from mail-bk0-f44.google.com (mail-bk0-f44.google.com [209.85.214.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id F1C7E9D2AE for ; Tue, 5 Jun 2012 19:04:07 -0400 (EDT) Received: by bkty8 with SMTP id y8so7804915bkt.17 for ; Tue, 05 Jun 2012 16:04:06 -0700 (PDT) MIME-Version: 1.0 Received: by 10.205.133.13 with SMTP id hw13mr10553400bkc.30.1338937446292; Tue, 05 Jun 2012 16:04:06 -0700 (PDT) Received: by 10.204.17.19 with HTTP; Tue, 5 Jun 2012 16:04:06 -0700 (PDT) In-Reply-To: <20120605175930.GA14242@w1.fi> References: <20120605175930.GA14242@w1.fi> Date: Wed, 6 Jun 2012 08:04:06 +0900 Message-ID: Subject: Re: [PATCH] P2P: Set Concurrent Operation bit in Beacon/Probe Response From: Masashi Honma To: hostap@lists.shmoo.com X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com 2012/6/6 Jouni Malinen : > > 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 group_capab |= P2P_GROUP_CAPAB_PERSISTENT_GROUP; Regards, Masashi Honma. 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) {