summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-06-07 13:27:26 +0200
committerFelix Fietkau <nbd@nbd.name>2016-06-11 09:51:23 +0200
commitdf7af9317b9fd9532497351288ff5697fe88e40d (patch)
treee0e0b78b1a6bd8cfa7a47fff7c13b107afd7ec0b /package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
parent69c99a423a8553cc808913fc4e3df848e4ed06d7 (diff)
downloadmaster-31e0f0ae-df7af9317b9fd9532497351288ff5697fe88e40d.tar.gz
master-31e0f0ae-df7af9317b9fd9532497351288ff5697fe88e40d.tar.bz2
master-31e0f0ae-df7af9317b9fd9532497351288ff5697fe88e40d.zip
ath10k: merge some pending stability fixes
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch')
-rw-r--r--package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
index 39aba41df4..9a7e81ba7d 100644
--- a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
+++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -1165,9 +1165,6 @@ static int ath10k_core_fetch_firmware_fi
+@@ -1168,9 +1168,6 @@ static int ath10k_core_fetch_firmware_fi
{
int ret;
@@ -10,7 +10,7 @@
ar->fw_api = 5;
ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
-@@ -1870,6 +1867,9 @@ static int ath10k_core_probe_fw(struct a
+@@ -1873,6 +1870,9 @@ static int ath10k_core_probe_fw(struct a
goto err_power_down;
}
@@ -20,7 +20,7 @@
ret = ath10k_core_fetch_firmware_files(ar);
if (ret) {
ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
-@@ -1892,11 +1892,14 @@ static int ath10k_core_probe_fw(struct a
+@@ -1895,11 +1895,14 @@ static int ath10k_core_probe_fw(struct a
"could not load pre cal data: %d\n", ret);
}