* [patch 1/2] ath6kl: change || to &&
@ 2012-04-20 6:43 Dan Carpenter
2012-04-20 8:37 ` Kalle Valo
2012-04-23 11:37 ` Kalle Valo
0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2012-04-20 6:43 UTC (permalink / raw)
To: Kalle Valo; +Cc: John W. Linville, linux-wireless, kernel-janitors
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];
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch 1/2] ath6kl: change || to &&
2012-04-20 6:43 [patch 1/2] ath6kl: change || to && Dan Carpenter
@ 2012-04-20 8:37 ` Kalle Valo
2012-04-20 8:51 ` Ng, Chilam
2012-04-23 11:37 ` Kalle Valo
1 sibling, 1 reply; 4+ messages in thread
From: Kalle Valo @ 2012-04-20 8:37 UTC (permalink / raw)
To: Dan Carpenter
Cc: John W. Linville, linux-wireless, kernel-janitors, ath6kl-devel,
Ng, Chilam
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [patch 1/2] ath6kl: change || to &&
2012-04-20 8:37 ` Kalle Valo
@ 2012-04-20 8:51 ` Ng, Chilam
0 siblings, 0 replies; 4+ messages in thread
From: Ng, Chilam @ 2012-04-20 8:51 UTC (permalink / raw)
To: Valo, Kalle, Dan Carpenter
Cc: John W. Linville, linux-wireless@vger.kernel.org,
kernel-janitors@vger.kernel.org, ath6kl-devel
Yes, the intention was &&, not ||. Thanks for catching this.
-Chilam
________________________________________
From: Valo, Kalle
Sent: Friday, April 20, 2012 1:37 AM
To: Dan Carpenter
Cc: John W. Linville; linux-wireless@vger.kernel.org; kernel-janitors@vger.kernel.org; ath6kl-devel; Ng, Chilam
Subject: Re: [patch 1/2] ath6kl: change || to &&
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 1/2] ath6kl: change || to &&
2012-04-20 6:43 [patch 1/2] ath6kl: change || to && Dan Carpenter
2012-04-20 8:37 ` Kalle Valo
@ 2012-04-23 11:37 ` Kalle Valo
1 sibling, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2012-04-23 11:37 UTC (permalink / raw)
To: Dan Carpenter; +Cc: John W. Linville, linux-wireless, kernel-janitors
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>
Thanks, both patches applied to ath6kl.git.
Kalle
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-23 11:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-20 6:43 [patch 1/2] ath6kl: change || to && Dan Carpenter
2012-04-20 8:37 ` Kalle Valo
2012-04-20 8:51 ` Ng, Chilam
2012-04-23 11:37 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).