Skip to content

Commit

Permalink
ath10k-ct: Update to 2018-12-11 and use version based on 4.19
Browse files Browse the repository at this point in the history
This updates the ath10k-ct driver to the version from 2018-12-11 and
selects the ath10k-ct version based on kernel 4.19 by default.

CONFIG_ATH10K_CE was introduced between kernel 4.16 and 4.19 and is a
mandatory option.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  • Loading branch information
hauke committed Dec 15, 2018
1 parent af1aa07 commit 4df3c71
Show file tree
Hide file tree
Showing 5 changed files with 583 additions and 24 deletions.
12 changes: 6 additions & 6 deletions package/kernel/ath10k-ct/Makefile
Expand Up @@ -8,14 +8,14 @@ PKG_LICENSE_FILES:=

PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2018-09-29
PKG_SOURCE_VERSION:=b9989fbd5d6e3269b3e49ab3ec71b4174a02209e
PKG_MIRROR_HASH:=67bb1c81518aea5880757d521023db25190d9cca21ba67bf1c7e577efd287430
PKG_SOURCE_DATE:=2018-12-11
PKG_SOURCE_VERSION:=812d90c08ca8ce8dcbd1b2281e89ff562c7096e1
PKG_MIRROR_HASH:=986feafd27a828801be96ce4177886204998beea305cda40aafe92a9636db852

# Build the 4.13 ath10k-ct driver version. Other options are "-4.9", or
# Build the 4.19 ath10k-ct driver version. Other options are "-4.16", or
# leave un-defined for 4.7 kernel. Probably this should match as closely as
# possible to whatever mac80211 backports version is being used.
CT_KVER="-4.16"
CT_KVER="-4.19"

PKG_MAINTAINER:=Ben Greear <greearb@candelatech.com>
PKG_BUILD_PARALLEL:=1
Expand Down Expand Up @@ -58,7 +58,7 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
endif

CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m
CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m CONFIG_ATH10K_CE=y

# This AHB logic is needed for IPQ4019 radios
CT_MAKEDEFS += CONFIG_ATH10K_AHB=m
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/ath10k-ct/patches/100-kernel_compat.patch
Expand Up @@ -108,7 +108,7 @@
return;
--- a/ath10k-4.16/wmi.c
+++ b/ath10k-4.16/wmi.c
@@ -4061,7 +4061,7 @@ static void ath10k_dfs_radar_report(stru
@@ -4063,7 +4063,7 @@ static void ath10k_dfs_radar_report(stru

ATH10K_DFS_STAT_INC(ar, pulses_detected);

Expand Down
Expand Up @@ -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
@@ -1559,14 +1559,61 @@ out:
@@ -1560,14 +1560,61 @@ out:
return ret;
}

Expand Down Expand Up @@ -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,
@@ -1604,73 +1651,28 @@ static int ath10k_core_fetch_board_data_
@@ -1605,73 +1652,28 @@ static int ath10k_core_fetch_board_data_
data += magic_len;
len -= magic_len;

Expand Down Expand Up @@ -397,7 +397,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
return 0;

err:
@@ -1679,12 +1681,12 @@ err:
@@ -1680,12 +1682,12 @@ err:
}

static int ath10k_core_create_board_name(struct ath10k *ar, char *name,
Expand All @@ -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);

@@ -1710,21 +1712,31 @@ out:
@@ -1711,21 +1713,31 @@ out:

static int ath10k_core_fetch_board_file(struct ath10k *ar)
{
Expand Down

0 comments on commit 4df3c71

Please sign in to comment.