projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
mvm
/
tx.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/tx.c
b/drivers/net/wireless/iwlwifi/mvm/tx.c
index
4f15d9d
..
d6cdb77
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/tx.c
@@
-209,7
+209,7
@@
void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd,
rate_plcp = iwl_mvm_mac80211_idx_to_hwrate(rate_idx);
mvm->mgmt_last_antenna_idx =
rate_plcp = iwl_mvm_mac80211_idx_to_hwrate(rate_idx);
mvm->mgmt_last_antenna_idx =
- iwl_mvm_next_antenna(mvm,
mvm->fw->valid_tx_ant
,
+ iwl_mvm_next_antenna(mvm,
iwl_mvm_get_valid_tx_ant(mvm)
,
mvm->mgmt_last_antenna_idx);
if (info->band == IEEE80211_BAND_2GHZ &&
mvm->mgmt_last_antenna_idx);
if (info->band == IEEE80211_BAND_2GHZ &&