|
|
|
@ -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
|
|
|
|
|
@@ -1429,14 +1429,61 @@ out:
|
|
|
|
|
@@ -1435,14 +1435,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,
|
|
|
|
|
@@ -1474,73 +1521,28 @@ static int ath10k_core_fetch_board_data_
|
|
|
|
|
@@ -1480,73 +1527,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:
|
|
|
|
|
@@ -1549,12 +1551,12 @@ err:
|
|
|
|
|
@@ -1555,12 +1557,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);
|
|
|
|
|
|
|
|
|
|
@@ -1580,21 +1582,31 @@ out:
|
|
|
|
|
@@ -1586,21 +1588,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
|
|
|
|
|
@@ -1563,14 +1563,61 @@ out:
|
|
|
|
|
@@ -1569,14 +1569,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,
|
|
|
|
|
@@ -1608,73 +1655,28 @@ static int ath10k_core_fetch_board_data_
|
|
|
|
|
@@ -1614,73 +1661,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:
|
|
|
|
|
@@ -1683,12 +1685,12 @@ err:
|
|
|
|
|
@@ -1689,12 +1691,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);
|
|
|
|
|
|
|
|
|
|
@@ -1714,21 +1716,31 @@ out:
|
|
|
|
|
@@ -1720,21 +1722,31 @@ out:
|
|
|
|
|
|
|
|
|
|
static int ath10k_core_fetch_board_file(struct ath10k *ar)
|
|
|
|
|
{
|
|
|
|
|