evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ath10k: Skip reading of utf.bin file"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-09 23:14:50 -08:00 • committed by Gerrit - the friendly Code Review server
commit f24c6aec3e
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/ath/ath10k/core.c
View file

@ -1303,7 +1303,7 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
int ret; int ret;
struct ath10k_fw_file *fw_file; struct ath10k_fw_file *fw_file;
if (!ar->is_bmi && QCA_REV_WCN3990(ar)) { if (!ar->is_bmi) {
fw_file = &ar->normal_mode_fw.fw_file; fw_file = &ar->normal_mode_fw.fw_file;
fw_file->wmi_op_version = ATH10K_FW_WMI_OP_VERSION_TLV; fw_file->wmi_op_version = ATH10K_FW_WMI_OP_VERSION_TLV;
fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_TLV; fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_TLV;

7
drivers/net/wireless/ath/ath10k/testmode.c
View file

@ -174,8 +174,15 @@ static int ath10k_tm_fetch_utf_firmware_api_1(struct ath10k *ar,
static int ath10k_tm_fetch_firmware(struct ath10k *ar) static int ath10k_tm_fetch_firmware(struct ath10k *ar)
{ {
struct ath10k_fw_components *utf_mode_fw; struct ath10k_fw_components *utf_mode_fw;
struct ath10k_fw_file *fw_file;
int ret; int ret;
if (!ar->is_bmi) {
fw_file = &ar->testmode.utf_mode_fw.fw_file;
fw_file->wmi_op_version = ATH10K_FW_WMI_OP_VERSION_TLV;
fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_TLV;
return 0;
}
ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_UTF_API2_FILE, ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_UTF_API2_FILE,
&ar->testmode.utf_mode_fw.fw_file); &ar->testmode.utf_mode_fw.fw_file);
if (ret == 0) { if (ret == 0) {