diff options
author | Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com> | 2011-11-29 10:00:35 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-30 15:08:34 -0500 |
commit | eb840a80d2e5f446ad58a6d4f14dcaa3d877a362 (patch) | |
tree | 98c95014115855a24f37a9511098660e26b4838e /drivers/net/wireless/ath/ath9k/recv.c | |
parent | 1a68abb0c85b5eb490971b622ff36168c64416a7 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/recv.c')
-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) | |||
1923 | skb = hdr_skb; | 1923 | skb = hdr_skb; |
1924 | } | 1924 | } |
1925 | 1925 | ||
1926 | /* | 1926 | |
1927 | * change the default rx antenna if rx diversity chooses the | 1927 | if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) { |
1928 | * other antenna 3 times in a row. | 1928 | |
1929 | */ | 1929 | /* |
1930 | if (sc->rx.defant != rs.rs_antenna) { | 1930 | * change the default rx antenna if rx diversity |
1931 | if (++sc->rx.rxotherant >= 3) | 1931 | * chooses the other antenna 3 times in a row. |
1932 | ath_setdefantenna(sc, rs.rs_antenna); | 1932 | */ |
1933 | } else { | 1933 | if (sc->rx.defant != rs.rs_antenna) { |
1934 | sc->rx.rxotherant = 0; | 1934 | if (++sc->rx.rxotherant >= 3) |
1935 | ath_setdefantenna(sc, rs.rs_antenna); | ||
1936 | } else { | ||
1937 | sc->rx.rxotherant = 0; | ||
1938 | } | ||
1939 | |||
1935 | } | 1940 | } |
1936 | 1941 | ||
1937 | if (rxs->flag & RX_FLAG_MMIC_STRIPPED) | 1942 | if (rxs->flag & RX_FLAG_MMIC_STRIPPED) |