diff options
| author | Mohammed Shafi Shajakhan | 2011-11-29 16:00:35 +0100 |
|---|---|---|
| committer | John W. Linville | 2011-11-30 21:08:34 +0100 |
| commit | eb840a80d2e5f446ad58a6d4f14dcaa3d877a362 (patch) | |
| tree | 98c95014115855a24f37a9511098660e26b4838e | |
| parent | ath9k: Fix LED GPIO pin for AR9462 (diff) | |
| download | kernel-qcow2-linux-eb840a80d2e5f446ad58a6d4f14dcaa3d877a362.tar.gz kernel-qcow2-linux-eb840a80d2e5f446ad58a6d4f14dcaa3d877a362.tar.xz kernel-qcow2-linux-eb840a80d2e5f446ad58a6d4f14dcaa3d877a362.zip | |
ath9k: change the default antenna settings based on diversity
change the AR_DEF_ANTENNA register settings i.e setting default antenna
setting only for antenna diversity enabled chipsets. no point in
doing this for MIMO chipsets
Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 4c8e296f663b..b1b0ec76157b 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -1923,15 +1923,20 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) skb = hdr_skb; } - /* - * change the default rx antenna if rx diversity chooses the - * other antenna 3 times in a row. - */ - if (sc->rx.defant != rs.rs_antenna) { - if (++sc->rx.rxotherant >= 3) - ath_setdefantenna(sc, rs.rs_antenna); - } else { - sc->rx.rxotherant = 0; + + if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) { + + /* + * change the default rx antenna if rx diversity + * chooses the other antenna 3 times in a row. + */ + if (sc->rx.defant != rs.rs_antenna) { + if (++sc->rx.rxotherant >= 3) + ath_setdefantenna(sc, rs.rs_antenna); + } else { + sc->rx.rxotherant = 0; + } + } if (rxs->flag & RX_FLAG_MMIC_STRIPPED) |