aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-24 11:57:27 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-24 12:22:29 +0100
commit703515f889124248480f39d65f8704548cbf1c09 (patch)
treecd06f11ec2cc4e6ddb75c8982ecaab9882d3a9ed /package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
parentd27dd6298b0f9a66199758b32ce19c0932ef2ee0 (diff)
downloadupstream-703515f889124248480f39d65f8704548cbf1c09.tar.gz
upstream-703515f889124248480f39d65f8704548cbf1c09.tar.bz2
upstream-703515f889124248480f39d65f8704548cbf1c09.zip
mac80211: sync with master branch as of 9edff13abd97
Includes the following changes: 9edff13abd mac80211: disable potentially harmful PS software retry for A-MPDU sessions 75216a76b0 mac80211: backport upstream fix for CSA in IBSS mode 368cc8ef47 mac80211: update brcmfmac backporting brcmf_err cleanups 66a63d25c4 mac80211: fix build on linux 3.18 9eacb9d7fc rt2x00: mt7620: lots of improvements fd94fa61a7 mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9 649e766a64 mac80211: update to wireless-testing 2017-01-31 47540afa5d ath9k: add a warning to the tx99 config option b367eef21d mac80211: rt2x00: add support for external LNA on MT7620 9200e168f2 mac80211: move (& update) upstream accepted brcmfmac patches 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.patch10
1 files changed, 5 insertions, 5 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 fbda8d5ac1..057995c55a 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
-@@ -1282,9 +1282,6 @@ static int ath10k_core_fetch_firmware_fi
+@@ -1362,9 +1362,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);
-@@ -2054,7 +2051,7 @@ EXPORT_SYMBOL(ath10k_core_stop);
+@@ -2149,7 +2146,7 @@ EXPORT_SYMBOL(ath10k_core_stop);
static int ath10k_core_probe_fw(struct ath10k *ar)
{
struct bmi_target_info target_info;
@@ -19,7 +19,7 @@
ret = ath10k_hif_power_up(ar);
if (ret) {
-@@ -2078,6 +2075,9 @@ static int ath10k_core_probe_fw(struct a
+@@ -2173,6 +2170,9 @@ static int ath10k_core_probe_fw(struct a
goto err_power_down;
}
@@ -29,7 +29,7 @@
ret = ath10k_core_fetch_firmware_files(ar);
if (ret) {
ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
-@@ -2100,11 +2100,14 @@ static int ath10k_core_probe_fw(struct a
+@@ -2195,11 +2195,14 @@ static int ath10k_core_probe_fw(struct a
"could not load pre cal data: %d\n", ret);
}
@@ -48,4 +48,4 @@
+ }
}
- ret = ath10k_core_fetch_board_file(ar);
+ ret = ath10k_core_check_smbios(ar);