summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDor Shaish <dor.shaish@intel.com>2013-02-27 23:00:27 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-03-04 13:35:06 +0100
commite07cbb536acb249db5fd63f6884354630ae875ad (patch)
tree4c5b96d72f573bcdb271792989db429d52fa9a4f
parent715c998ff4d1106c3096bc5a48e4196663e6701a (diff)
iwlwifi: mvm: Set valid TX antennas value before calib request
We must set the valid TX antennas number in the ucode before sending the phy_cfg_cmd and request for calibrations. Signed-off-by: Dor Shaish <dor.shaish@intel.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/fw.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index d3d959db03a9..e6d51a9069c9 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -446,6 +446,11 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
ret = iwl_nvm_check_version(mvm->nvm_data, mvm->trans);
WARN_ON(ret);
+ /* Send TX valid antennas before triggering calibrations */
+ ret = iwl_send_tx_ant_cfg(mvm, mvm->nvm_data->valid_tx_ant);
+ if (ret)
+ goto error;
+
/* Override the calibrations from TLV and the const of fw */
iwl_set_default_calib_trigger(mvm);