ath9k: Fix BTCOEX usage for RX diversity
authorSujith Manoharan <c_manoha@qca.qualcomm.com>
Wed, 7 Aug 2013 06:59:27 +0000 (12:29 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Aug 2013 19:58:26 +0000 (15:58 -0400)
BTCOEX has to be *disabled* for WLAN RX diversity to
work on combo cards.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/init.c

index 4afe30e0bf49e9b95a835221075f0f1b631bb00a..3b56c2e7efe7ed1470030fe54df4ddd32787c39f 100644 (file)
@@ -645,11 +645,11 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
        /*
         * Enable WLAN/BT RX Antenna diversity only when:
         *
-        * - BTCOEX is enabled
+        * - BTCOEX is disabled.
         * - the user manually requests the feature.
         * - the HW cap is set using the platform data.
         */
-       if (common->btcoex_enabled && ath9k_bt_ant_diversity &&
+       if (!common->btcoex_enabled && ath9k_bt_ant_diversity &&
            (pCap->hw_caps & ATH9K_HW_CAP_BT_ANT_DIV))
                common->bt_ant_diversity = 1;