diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-03-09 13:38:19 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-20 09:17:12 -0400 |
commit | 332235427a566d8be04b9676a7ac380c8853aa9b (patch) | |
tree | 1a4af05725814a13bd734bca87bff96799b0a686 /drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |
parent | d110cb51cf109a6dff0e801d945ea98d2883bd01 (diff) |
iwlwifi: mvm: take the valid_{rx,tx}_ant from the TLV
This is the right source of information for the valid Tx
antennas, not the NVM.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c index c45822fb937d..86e312a4f629 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |||
@@ -803,7 +803,7 @@ static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm, | |||
803 | TX_CMD_FLG_TSF); | 803 | TX_CMD_FLG_TSF); |
804 | 804 | ||
805 | mvm->mgmt_last_antenna_idx = | 805 | mvm->mgmt_last_antenna_idx = |
806 | iwl_mvm_next_antenna(mvm, mvm->nvm_data->valid_tx_ant, | 806 | iwl_mvm_next_antenna(mvm, iwl_fw_valid_tx_ant(mvm->fw), |
807 | mvm->mgmt_last_antenna_idx); | 807 | mvm->mgmt_last_antenna_idx); |
808 | 808 | ||
809 | beacon_cmd.tx.rate_n_flags = | 809 | beacon_cmd.tx.rate_n_flags = |