Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f24c6aec authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents e6408fea 086d1f49

drivers/net/wireless/ath/ath10k/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar) 
	int ret;

	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->wmi_op_version = ATH10K_FW_WMI_OP_VERSION_TLV;

		fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_TLV;

drivers/net/wireless/ath/ath10k/testmode.c

+7 −0
Original line number Diff line number Diff line
@@ -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)

{

	struct ath10k_fw_components *utf_mode_fw;

	struct ath10k_fw_file *fw_file;

	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,

					       &ar->testmode.utf_mode_fw.fw_file);

	if (ret == 0) {