summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi
diff options
context:
space:
mode:
authorLuca Coelho2017-08-15 22:12:39 +0200
committerLuca Coelho2017-08-18 16:36:41 +0200
commit8a0d53ce10053ce39b9512a054ab4c0bef2e2cc3 (patch)
tree40e3722ab08f0159030c750739d21ae0177a8277 /drivers/net/wireless/intel/iwlwifi
parentiwlwifi: add workaround to disable wide channels in 5GHz (diff)
downloadkernel-qcow2-linux-8a0d53ce10053ce39b9512a054ab4c0bef2e2cc3.tar.gz
kernel-qcow2-linux-8a0d53ce10053ce39b9512a054ab4c0bef2e2cc3.tar.xz
kernel-qcow2-linux-8a0d53ce10053ce39b9512a054ab4c0bef2e2cc3.zip
iwlwifi: fw: fix lar_enabled endian problem in iwl_fw_get_nvm
We read the regulatory.lar_enabled field in iwl_fw_get_nvm() and store it in nvm->lar_enabled, taking care of endianness. But then later we read it again to pass the value to iwl_init_sbands() without handling endianness. To solve this, simply reuse nvm->lar_enabled when calling that function. Fixes: e9e1ba3dbf00 ("iwlwifi: mvm: support getting nvm data from firmware") Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/fw/nvm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/nvm.c b/drivers/net/wireless/intel/iwlwifi/fw/nvm.c
index e81f6dd3744e..bd2e1fb43f5a 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/nvm.c
@@ -148,8 +148,7 @@ struct iwl_nvm_data *iwl_fw_get_nvm(struct iwl_fw_runtime *fwrt)
rsp->regulatory.channel_profile,
nvm->valid_tx_ant & fwrt->fw->valid_tx_ant,
nvm->valid_rx_ant & fwrt->fw->valid_rx_ant,
- rsp->regulatory.lar_enabled && lar_fw_supported,
- false);
+ nvm->lar_enabled, false);
iwl_free_resp(&hcmd);
return nvm;