diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
commit | 1e5b7c17b031359a37ed7772b92cc98aaaeac727 (patch) | |
tree | 5e2a88ef16da6f5c7c3b74ef607e5ba892252d5b /package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch | |
parent | ee1e8c2f2df3b03ef89e5a8b31ae9e2f9907ade1 (diff) | |
download | upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.gz upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.bz2 upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.zip |
mac80211: update to wireless-testing 2015-03-09
Based on patch by Bryan Forbes <bryan@reigndropsfall.net>
Also update mt76 to update for API changes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44655
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 | 22 |
1 files changed, 14 insertions, 8 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 d04c4abb14..4c04d4f0ac 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,14 +1,20 @@ --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c -@@ -280,7 +280,10 @@ static int ath10k_download_and_run_otp(s +@@ -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 (result != 0) { -+ if (result == 2) { -+ ath10k_warn(ar, "otp stream is empty, using board.bin contents"); -+ return 0; -+ } else if (result != 0) { - ath10k_err(ar, "otp calibration failed: %d", result); - return -EINVAL; +- if (!skip_otp && 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) { ++ ath10k_err(ar, "otp calibration failed: %d", result); ++ return -EINVAL; ++ } } + + return 0; |