]> Pileus Git - ~andy/linux/commitdiff
ath9k: fix check for antenna diversity support
authorFelix Fietkau <nbd@openwrt.org>
Sun, 4 Dec 2011 07:38:54 +0000 (08:38 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 20:06:34 +0000 (15:06 -0500)
fixes a regression on single-stream chips introduced in
commit 43c3528430bd29f5e52438cad7cf7c0c62bf4583
"ath9k: implement .get_antenna and .set_antenna"

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Reported-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/main.c

index 93fbe6f4089890df98b98904921879ab97835b98..d2348a5a7809bd1e2233f39a2b6f192443234f2f 100644 (file)
@@ -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;