aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch
diff options
context:
space:
mode:
authorThomas Hebb <tommyhebb@gmail.com>2018-01-12 15:59:25 -0500
committerMathias Kresin <dev@kresin.me>2018-04-20 21:08:52 +0200
commit751746c736bbda828ff1add002a0419a3b883e63 (patch)
tree93bace393f02095608250ba336f71a8addcbcc0e /package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch
parent16b25ad8292eee4492a9b8309dc6c15b298d040a (diff)
downloadupstream-751746c736bbda828ff1add002a0419a3b883e63.tar.gz
upstream-751746c736bbda828ff1add002a0419a3b883e63.tar.bz2
upstream-751746c736bbda828ff1add002a0419a3b883e63.zip
mac80211: update patch to read ath10k variant from DT
This patch was revised upstream before being merged, and OpenWrt's copy was never updated to reflect the revision. Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> [refreshed patches] Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch')
-rw-r--r--package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch b/package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch
index cac396aeca..357b006bcc 100644
--- a/package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch
+++ b/package/kernel/mac80211/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch
@@ -47,7 +47,7 @@ Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -1129,14 +1129,61 @@ out:
+@@ -1132,14 +1132,61 @@ out:
return ret;
}
@@ -112,7 +112,7 @@ Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar,
ar->hw_params.fw.dir,
-@@ -1174,69 +1221,23 @@ static int ath10k_core_fetch_board_data_
+@@ -1177,69 +1224,23 @@ static int ath10k_core_fetch_board_data_
data += magic_len;
len -= magic_len;
@@ -191,7 +191,7 @@ Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
return 0;
err:
-@@ -1245,12 +1246,12 @@ err:
+@@ -1248,12 +1249,12 @@ err:
}
static int ath10k_core_create_board_name(struct ath10k *ar, char *name,
@@ -206,7 +206,7 @@ Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
scnprintf(variant, sizeof(variant), ",variant=%s",
ar->id.bdf_ext);
-@@ -1276,17 +1277,26 @@ out:
+@@ -1279,17 +1280,26 @@ out:
static int ath10k_core_fetch_board_file(struct ath10k *ar)
{