From: Kalle Valo <kvalo@qca.qualcomm.com>
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 &&
Date: Fri, 20 Apr 2012 08:37:18 +0000 [thread overview]
Message-ID: <4F91203E.9090308@qca.qualcomm.com> (raw)
In-Reply-To: <20120420064328.GC22649@elgon.mountain>
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
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com>
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 &&
Date: Fri, 20 Apr 2012 11:37:18 +0300 [thread overview]
Message-ID: <4F91203E.9090308@qca.qualcomm.com> (raw)
In-Reply-To: <20120420064328.GC22649@elgon.mountain>
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
next prev parent reply other threads:[~2012-04-20 8:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 6:43 [patch 1/2] ath6kl: change || to && Dan Carpenter
2012-04-20 6:43 ` Dan Carpenter
2012-04-20 8:37 ` Kalle Valo [this message]
2012-04-20 8:37 ` Kalle Valo
2012-04-20 8:51 ` Ng, Chilam
2012-04-23 11:37 ` Kalle Valo
2012-04-23 11:37 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F91203E.9090308@qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath6kl-devel@qualcomm.com \
--cc=chilamng@qca.qualcomm.com \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.