aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/init.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-15 08:25:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-19 15:58:25 -0400
commitbf3f204b92c48c4afa3e827dfe98353560d9aa7f (patch)
tree2b8c37bf9d5f055be8fdf4c10868d14371e4e76a /drivers/net/wireless/ath/ath9k/init.c
parentd7084da0ceeddb9caf84de20cf687bb4a9b842b1 (diff)
ath9k_hw: fix setting the hardware diversity flag
ath9k_hw_set_diversity is only called from init.c where it cannot affect the hardware setting because it's cleared on the next reset. Instead of using a PHY op for something that's supposed to be initialized statically, set the register value directly in the INI override function. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 9b34c4bab937..39514de044ef 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -506,7 +506,6 @@ static void ath9k_init_misc(struct ath_softc *sc)
506 sc->sc_flags |= SC_OP_RXAGGR; 506 sc->sc_flags |= SC_OP_RXAGGR;
507 } 507 }
508 508
509 ath9k_hw_set_diversity(sc->sc_ah, true);
510 sc->rx.defant = ath9k_hw_getdefantenna(sc->sc_ah); 509 sc->rx.defant = ath9k_hw_getdefantenna(sc->sc_ah);
511 510
512 memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); 511 memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);