2011-12-04 07:39:06

by Felix Fietkau

[permalink] [raw]
Subject: [PATCH 3.2] ath9k: fix check for antenna diversity support

fixes a regression on single-stream chips introduced in
commit 43c3528430bd29f5e52438cad7cf7c0c62bf4583
"ath9k: implement .get_antenna and .set_antenna"

Signed-off-by: Felix Fietkau <[email protected]>
---
drivers/net/wireless/ath/ath9k/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 714c7d8..1c87c7f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -286,7 +286,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
ath_start_ani(common);
}

- if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) {
+ if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
struct ath_hw_antcomb_conf div_ant_conf;
u8 lna_conf;

--
1.7.3.2



2011-12-04 07:48:00

by Marek Lindner

[permalink] [raw]
Subject: Re: [PATCH 3.2] ath9k: fix check for antenna diversity support

On Sunday, December 04, 2011 15:38:54 Felix Fietkau wrote:
> fixes a regression on single-stream chips introduced in
> commit 43c3528430bd29f5e52438cad7cf7c0c62bf4583
> "ath9k: implement .get_antenna and .set_antenna"
>
> Signed-off-by: Felix Fietkau <[email protected]>

Thanks for adding me[1] as "Reported-by" ..

Regards,
Marek

[1] http://article.gmane.org/gmane.comp.embedded.openwrt.devel/11952