2016-04-29 13:07:30

by Helmut Schaa

Subject: [PATCH] ath9k: Fix symbol overlap window for half/quarter channels

Since commit cd6cfd7311a385144a2f9c74f692ae2df3ae033f
"ath9k: do not set half/quarter channel flags in AR_PHY_MODE" the
condition "rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF)" would
never evaluate to true.

Fix this by using the available IS_CHAN_HALF_RATE and IS_CHAN_QUARTER_RATE
marcros instead.

Signed-off-by: Helmut Schaa <[email protected]>
Cc: Felix Fietkau <[email protected]>
---
Just stumbled over that piece of code while looking into TX99, so
this is only compile-tested.

Felix, can you please confirm if this is correct or if removing
the whole block would be better?

Thanks,
Helmut

drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 81ab3ca..ae304355 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -1010,7 +1010,7 @@ static void ar9003_hw_set_rfmode(struct ath_hw *ah,
if (IS_CHAN_A_FAST_CLOCK(ah, chan))
rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);

- if (rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF))
+ if (IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))
REG_RMW_FIELD(ah, AR_PHY_FRAME_CTL,
AR_PHY_FRAME_CTL_CF_OVERLAP_WINDOW, 3);

--
2.8.1

2016-04-30 03:52:47

by Felix Fietkau

Subject: Re: [PATCH] ath9k: Fix symbol overlap window for half/quarter channels

On 2016-04-29 20:06, Helmut Schaa wrote:
> Since commit cd6cfd7311a385144a2f9c74f692ae2df3ae033f
> "ath9k: do not set half/quarter channel flags in AR_PHY_MODE" the
> condition "rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF)" would
> never evaluate to true.
>
> Fix this by using the available IS_CHAN_HALF_RATE and IS_CHAN_QUARTER_RATE
> marcros instead.
>
> Signed-off-by: Helmut Schaa <[email protected]>
> Cc: Felix Fietkau <[email protected]>
> ---
> Just stumbled over that piece of code while looking into TX99, so
> this is only compile-tested.
>
> Felix, can you please confirm if this is correct or if removing
> the whole block would be better?
This patch looks good to me.
Acked-by: Felix Fietkau <[email protected]>

2016-05-09 18:13:58

by Kalle Valo

Subject: Re: [PATCH] ath9k: Fix symbol overlap window for half/quarter channels

Helmut Schaa <[email protected]> writes:

> Since commit cd6cfd7311a385144a2f9c74f692ae2df3ae033f
> "ath9k: do not set half/quarter channel flags in AR_PHY_MODE" the
> condition "rfMode & (AR_PHY_MODE_QUARTER | AR_PHY_MODE_HALF)" would
> never evaluate to true.
>
> Fix this by using the available IS_CHAN_HALF_RATE and IS_CHAN_QUARTER_RATE
> marcros instead.
>
> Signed-off-by: Helmut Schaa <[email protected]>
> Cc: Felix Fietkau <[email protected]>

Thanks, applied to ath.git.

--
Kalle Valo