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
/
phy-ctxt.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index
1c0d4a4
..
540c36b
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@
-176,7
+176,7
@@
static void iwl_mvm_phy_ctxt_cmd_data(struct iwl_mvm *mvm,
cmd->rxchain_info |= cpu_to_le32(active_cnt <<
PHY_RX_CHAIN_MIMO_CNT_POS);
- cmd->txchain_info = cpu_to_le32(
mvm->fw->valid_tx_ant
);
+ cmd->txchain_info = cpu_to_le32(
iwl_mvm_get_valid_tx_ant(mvm)
);
}
/*