diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
| commit | dd8008aa78bed570c903cc167ba16591f246da78 (patch) | |
| tree | 41e7adc38cd141c1e46de42d5ad433e6436e048d /package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch | |
| parent | 634e6c6b9ae7ed82ab8d95da8f2a596534534111 (diff) | |
| download | master-187ad058-dd8008aa78bed570c903cc167ba16591f246da78.tar.gz master-187ad058-dd8008aa78bed570c903cc167ba16591f246da78.tar.bz2 master-187ad058-dd8008aa78bed570c903cc167ba16591f246da78.zip | |
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42683 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 | 8 |
1 files changed, 4 insertions, 4 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 6a5c766dcc..81a16e25fd 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,14 @@ --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c -@@ -277,7 +277,10 @@ static int ath10k_download_and_run_otp(s +@@ -250,7 +250,10 @@ static int ath10k_download_and_run_otp(s - ath10k_dbg(ATH10K_DBG_BOOT, "boot otp execute result %d\n", result); + ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot otp execute result %d\n", result); - if (result != 0) { + if (result == 2) { -+ ath10k_warn("otp stream is empty, using board.bin contents"); ++ ath10k_warn(ar, "otp stream is empty, using board.bin contents"); + return 0; + } else if (result != 0) { - ath10k_err("otp calibration failed: %d", result); + ath10k_err(ar, "otp calibration failed: %d", result); return -EINVAL; } |