X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fath10k-ct%2Fpatches%2F160-ath10k-search-all-IEs-for-variant-before-falling-back.patch;h=880d6626e747bc5d6292439e054bbf42b2a5ce52;hp=cb7aec06f5d1ba66a75aa1db85bcc76001536b3e;hb=5c83f27ac5764fbd9667d014cc9f5747e655069e;hpb=33727ecea5675b477986d0370cfd461495a41fd1 diff --git a/package/kernel/ath10k-ct/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch b/package/kernel/ath10k-ct/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch index cb7aec06f5..880d6626e7 100644 --- a/package/kernel/ath10k-ct/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch +++ b/package/kernel/ath10k-ct/patches/160-ath10k-search-all-IEs-for-variant-before-falling-back.patch @@ -50,7 +50,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux --- a/ath10k-4.13/core.c +++ b/ath10k-4.13/core.c -@@ -1427,14 +1427,61 @@ out: +@@ -1429,14 +1429,61 @@ out: return ret; } @@ -115,7 +115,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir, -@@ -1472,73 +1519,28 @@ static int ath10k_core_fetch_board_data_ +@@ -1474,73 +1521,28 @@ static int ath10k_core_fetch_board_data_ data += magic_len; len -= magic_len; @@ -198,7 +198,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux return 0; err: -@@ -1547,12 +1549,12 @@ err: +@@ -1549,12 +1551,12 @@ err: } static int ath10k_core_create_board_name(struct ath10k *ar, char *name, @@ -213,7 +213,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux scnprintf(variant, sizeof(variant), ",variant=%s", ar->id.bdf_ext); -@@ -1578,21 +1580,31 @@ out: +@@ -1580,21 +1582,31 @@ out: static int ath10k_core_fetch_board_file(struct ath10k *ar) { @@ -249,7 +249,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux goto success; --- a/ath10k-4.16/core.c +++ b/ath10k-4.16/core.c -@@ -1560,14 +1560,61 @@ out: +@@ -1561,14 +1561,61 @@ out: return ret; } @@ -314,7 +314,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir, -@@ -1605,73 +1652,28 @@ static int ath10k_core_fetch_board_data_ +@@ -1606,73 +1653,28 @@ static int ath10k_core_fetch_board_data_ data += magic_len; len -= magic_len; @@ -397,7 +397,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux return 0; err: -@@ -1680,12 +1682,12 @@ err: +@@ -1681,12 +1683,12 @@ err: } static int ath10k_core_create_board_name(struct ath10k *ar, char *name, @@ -412,7 +412,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux scnprintf(variant, sizeof(variant), ",variant=%s", ar->id.bdf_ext); -@@ -1711,21 +1713,31 @@ out: +@@ -1712,21 +1714,31 @@ out: static int ath10k_core_fetch_board_file(struct ath10k *ar) {