diff options
| author | Emmanuel Grumbach | 2013-03-09 19:38:19 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-03-20 14:17:12 +0100 |
| commit | 332235427a566d8be04b9676a7ac380c8853aa9b (patch) | |
| tree | 1a4af05725814a13bd734bca87bff96799b0a686 /drivers/net/wireless/iwlwifi/mvm/scan.c | |
| parent | iwlwifi: mvm: take the radio type / step / dash from TLVs (diff) | |
| download | kernel-qcow2-linux-332235427a566d8be04b9676a7ac380c8853aa9b.tar.gz kernel-qcow2-linux-332235427a566d8be04b9676a7ac380c8853aa9b.tar.xz kernel-qcow2-linux-332235427a566d8be04b9676a7ac380c8853aa9b.zip | |
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/scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 0d3c76b29242..2157b0f8ced5 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -74,7 +74,7 @@ static inline __le16 iwl_mvm_scan_rx_chain(struct iwl_mvm *mvm) { u16 rx_chain; - u8 rx_ant = mvm->nvm_data->valid_rx_ant; + u8 rx_ant = iwl_fw_valid_rx_ant(mvm->fw); rx_chain = rx_ant << PHY_RX_CHAIN_VALID_POS; rx_chain |= rx_ant << PHY_RX_CHAIN_FORCE_MIMO_SEL_POS; @@ -115,7 +115,7 @@ iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum ieee80211_band band, u32 tx_ant; mvm->scan_last_antenna_idx = - iwl_mvm_next_antenna(mvm, mvm->nvm_data->valid_tx_ant, + iwl_mvm_next_antenna(mvm, iwl_fw_valid_tx_ant(mvm->fw), mvm->scan_last_antenna_idx); tx_ant = BIT(mvm->scan_last_antenna_idx) << RATE_MCS_ANT_POS; |