2019-02-18 09:34:04

by Dan Carpenter

Subject: [PATCH] carl9170: clean up a clamp() call

The parameter order for clamp is supposed to be clamp(value, low, high).
When we write it in this order it's equivalent to
min(head->plcp[3] & 0x7f, 75) which works in this context where the min
is zero. But it's not a correct use of the API.

Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/net/wireless/ath/carl9170/rx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index f7c2f19e81c1..8e154f6364a3 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -427,7 +427,7 @@ static int carl9170_rx_mac_status(struct ar9170 *ar,
if (head->plcp[6] & 0x80)
status->enc_flags |= RX_ENC_FLAG_SHORT_GI;

- status->rate_idx = clamp(0, 75, head->plcp[3] & 0x7f);
+ status->rate_idx = clamp(head->plcp[3] & 0x7f, 0, 75);
status->encoding = RX_ENC_HT;
break;

--
2.17.1

2019-02-18 16:04:54

by Christian Lamparter

Subject: Re: [PATCH] carl9170: clean up a clamp() call

On Monday, February 18, 2019 10:31:54 AM CET Dan Carpenter wrote:
> The parameter order for clamp is supposed to be clamp(value, low, high).
> When we write it in this order it's equivalent to
> min(head->plcp[3] & 0x7f, 75) which works in this context where the min
> is zero. But it's not a correct use of the API.
>
> Signed-off-by: Dan Carpenter <[email protected]>
Acked-by: Christian Lamparter <[email protected]>

> ---
> drivers/net/wireless/ath/carl9170/rx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
> index f7c2f19e81c1..8e154f6364a3 100644
> --- a/drivers/net/wireless/ath/carl9170/rx.c
> +++ b/drivers/net/wireless/ath/carl9170/rx.c
> @@ -427,7 +427,7 @@ static int carl9170_rx_mac_status(struct ar9170 *ar,
> if (head->plcp[6] & 0x80)
> status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
>
> - status->rate_idx = clamp(0, 75, head->plcp[3] & 0x7f);
> + status->rate_idx = clamp(head->plcp[3] & 0x7f, 0, 75);
> status->encoding = RX_ENC_HT;
> break;
>
>

2019-02-19 15:18:34

by Kalle Valo

Subject: Re: [PATCH] carl9170: clean up a clamp() call

Dan Carpenter <[email protected]> wrote:

> The parameter order for clamp is supposed to be clamp(value, low, high).
> When we write it in this order it's equivalent to
> min(head->plcp[3] & 0x7f, 75) which works in this context where the min
> is zero. But it's not a correct use of the API.
>
> Signed-off-by: Dan Carpenter <[email protected]>
> Acked-by: Christian Lamparter <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

dc76bb1e12e9 carl9170: clean up a clamp() call

--
https://patchwork.kernel.org/patch/10817541/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches