From patchwork Fri Oct 4 06:36:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sreenath X-Patchwork-Id: 280474 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 3EE012C0099 for ; Fri, 4 Oct 2013 16:37:14 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 4048F9D248; Fri, 4 Oct 2013 02:37: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 xNG9Tk-1DHb7; Fri, 4 Oct 2013 02:37:10 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 7B6199D23C; Fri, 4 Oct 2013 02:37:06 -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 533969D23C for ; Fri, 4 Oct 2013 02:37:05 -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 1IPUga9t6uRI for ; Fri, 4 Oct 2013 02:37:00 -0400 (EDT) Received: from mms3.broadcom.com (mms3.broadcom.com [216.31.210.19]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id A96739D239 for ; Fri, 4 Oct 2013 02:37:00 -0400 (EDT) Received: from [10.9.208.53] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Thu, 03 Oct 2013 23:36:52 -0700 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from SJEXCHCAS03.corp.ad.broadcom.com (10.16.203.8) by IRVEXCHCAS06.corp.ad.broadcom.com (10.9.208.53) with Microsoft SMTP Server (TLS) id 14.1.438.0; Thu, 3 Oct 2013 23:36:53 -0700 Received: from SJEXCHMB09.corp.ad.broadcom.com ( [fe80::3da7:665e:cc78:181f]) by SJEXCHCAS03.corp.ad.broadcom.com ( [::1]) with mapi id 14.01.0438.000; Thu, 3 Oct 2013 23:36:53 -0700 From: "Sreenath S" To: "Jouni Malinen" Subject: RE: [PATCH] P2P: Fix for multi channel concurrency Thread-Topic: [PATCH] P2P: Fix for multi channel concurrency Thread-Index: AQHOr7ag+UnaiIVfJkucq749be4enJnkOGwA Date: Fri, 4 Oct 2013 06:36:52 +0000 Message-ID: <5F8A83CFE238064080EB46F88B8161C1013BD009@SJEXCHMB09.corp.ad.broadcom.com> References: <20130912124930.GA29850@sreenath-Precision-M4700> In-Reply-To: <20130912124930.GA29850@sreenath-Precision-M4700> Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.9.208.57] MIME-Version: 1.0 X-WSS-ID: 7E50BD8E2L891482427-01-01 Cc: "hostap@lists.shmoo.com" X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 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 Hi Jouni, Any update on this patch? Regards, Sreenath diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 9338ad5..c6b3c8e 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -3964,14 +3964,14 @@ static int wpas_p2p_setup_freqs(struct wpa_supplicant *wpa_s, int freq, if (!p2p_supported_freq(wpa_s->global->p2p, freqs[i])) continue; - wpa_printf(MSG_DEBUG, "P2P: Try to force us to use frequency (%u MHz) which is already in use", - *force_freq); - *force_freq = freqs[i]; - - if (*pref_freq == 0 && num < wpa_s->num_multichan_concurrent) { - wpa_printf(MSG_DEBUG, "P2P: Try to prefer a frequency we are already using"); - *pref_freq = *force_freq; - } + if (num < wpa_s->num_multichan_concurrent) { + wpa_printf(MSG_DEBUG, "P2P: Try to prefer a frequency we are already using"); + *pref_freq = freqs[i]; + } else { + wpa_printf(MSG_DEBUG, "P2P: Try to force us to use frequency (%u MHz) which is already in use", + *force_freq); + *force_freq = freqs[i]; + } break; }