diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-07-06 16:26:34 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-06 16:26:34 +0000 |
| commit | 9b73f4e9475e95737d16630677a49809aa83e40d (patch) | |
| tree | 66d0dbbf2f9cac91f4c5a4c9800a040d8fc9e7c9 /package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch | |
| parent | 3d3e17a76291b9abf4ab801b79ebd9f51f8337ab (diff) | |
| download | master-187ad058-9b73f4e9475e95737d16630677a49809aa83e40d.tar.gz master-187ad058-9b73f4e9475e95737d16630677a49809aa83e40d.tar.bz2 master-187ad058-9b73f4e9475e95737d16630677a49809aa83e40d.zip | |
mac80211: update to version 2015-06-22
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46198 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch b/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch index 4c04d4f0ac..2626d78031 100644 --- a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch +++ b/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch @@ -1,17 +1,15 @@ --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c -@@ -387,9 +387,14 @@ static int ath10k_download_and_run_otp(s - - ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot otp execute result %d\n", result); - -- if (!skip_otp && result != 0) { +@@ -391,8 +391,13 @@ static int ath10k_download_and_run_otp(s + if (!(skip_otp || test_bit(ATH10K_FW_FEATURE_IGNORE_OTP_RESULT, + ar->fw_features)) + && result != 0) { - ath10k_err(ar, "otp calibration failed: %d", result); - return -EINVAL; -+ if (!skip_otp) { + if (result == 2) { + ath10k_warn(ar, "otp stream is empty, using board.bin contents"); + return 0; -+ } else if (result != 0) { ++ } else { + ath10k_err(ar, "otp calibration failed: %d", result); + return -EINVAL; + } |