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
/
mac-ctxt.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
index
f6d86cc
..
7196b4d
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@
-975,7
+975,7
@@
static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,
beacon_cmd.tx.tx_flags = cpu_to_le32(tx_flags);
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);
beacon_cmd.tx.rate_n_flags =