iwlwifi: mvm: don't allow diversity if BT Coex / TT forbid it

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / mvm / phy-ctxt.c

diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index acb79af6fa8965228a342004575c346e9480489c..539f3a942d437565ab6ba9accd06f71874985af4 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@ -163,8 +163,7 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
         * between the two antennas is sufficiently different to impact
         * performance.
         */
-       if (active_cnt == 1 && num_of_ant(mvm->fw->valid_rx_ant) > 1 &&
-           !mvm->cfg->rx_with_siso_diversity) {
+       if (active_cnt == 1 && iwl_mvm_rx_diversity_allowed(mvm)) {
                idle_cnt = 2;
                active_cnt = 2;
        }