From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <linux-wireless-owner@vger.kernel.org>
Received: from wolverine01.qualcomm.com ([199.106.114.254]:30395 "EHLO
	wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751052Ab2DTIh1 (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Fri, 20 Apr 2012 04:37:27 -0400
Message-ID: <4F91203E.9090308@qca.qualcomm.com> (sfid-20120420_103742_222234_C167AB3D)
Date: Fri, 20 Apr 2012 11:37:18 +0300
From: Kalle Valo <kvalo@qca.qualcomm.com>
MIME-Version: 1.0
To: Dan Carpenter <dan.carpenter@oracle.com>
CC: "John W. Linville" <linville@tuxdriver.com>,
	<linux-wireless@vger.kernel.org>,
	<kernel-janitors@vger.kernel.org>,
	ath6kl-devel <ath6kl-devel@qualcomm.com>,
	"Ng, Chilam" <chilamng@qca.qualcomm.com>
Subject: Re: [patch 1/2] ath6kl: change || to &&
References: <20120420064328.GC22649@elgon.mountain>
In-Reply-To: <20120420064328.GC22649@elgon.mountain>
Content-Type: text/plain; charset="ISO-8859-1"
Sender: linux-wireless-owner@vger.kernel.org
List-ID: <linux-wireless.vger.kernel.org>

On 04/20/2012 09:43 AM, Dan Carpenter wrote:
> The original conditions are always true.  I think && was intended here,
> but I don't have the hardware to test.  Could you take a look?
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
> index 065e615..086a8e1 100644
> --- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
> +++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
> @@ -758,7 +758,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
>  	u32 txb_mask;
>  	u8 ac = WMM_NUM_AC;
>  
> -	if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) ||
> +	if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
>  	    (WMI_CONTROL_SVC != endpoint->svc_id))
>  		ac = target->dev->ar->ep2ac_map[endpoint->eid];
>  
> @@ -866,7 +866,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
>  	 */
>  	INIT_LIST_HEAD(&txq);
>  
> -	if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) ||
> +	if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
>  	    (WMI_CONTROL_SVC != endpoint->svc_id))
>  		ac = target->dev->ar->ep2ac_map[endpoint->eid];

Dan, that's a good catch. This is coming from Chilam's patch:

https://github.com/kvalo/ath6kl/commit/b29072cc7b0e08ace48ab709c40cf6246fb2e8b0

Chilam, is it safe to take Dan's patch?

Kalle