iwlwifi: mvm: fix rx chains configuration in phy ctxt cmd
authorLiad Kaufman <liad.kaufman@intel.com>
Thu, 22 Jan 2015 17:01:35 +0000 (19:01 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 22 Jan 2015 20:17:22 +0000 (22:17 +0200)
In the PHY_CTXT command sent to the FW the TX chains were
indeed configured by the values of both FW TLVs and of NVM,
but the RX chains were left out and configured only by FW
TLV.

This causes problems in 4165 HW, where there are 1x1
antennas, and the wrong configuration denies the driver
from connecting to the AP.

Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c

index 540c36bae2687bf0c8ca3c9f057c11e5b9b04bec..5b43616eeb06332dedd68299650583ec292b201f 100644 (file)
@@ -170,7 +170,7 @@ static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
                active_cnt = 2;
        }
 
-       cmd->rxchain_info = cpu_to_le32(mvm->fw->valid_rx_ant <<
+       cmd->rxchain_info = cpu_to_le32(iwl_mvm_get_valid_rx_ant(mvm) <<
                                        PHY_RX_CHAIN_VALID_POS);
        cmd->rxchain_info |= cpu_to_le32(idle_cnt << PHY_RX_CHAIN_CNT_POS);
        cmd->rxchain_info |= cpu_to_le32(active_cnt <<