[LEDE-DEV] [PATCH] ath10k-ct: fix module depends

[Rosen Penev]

There are 4 other patches on patchwork that have not been merged for
some reason. They conflict with this patch.

On Thu, Mar 22, 2018 at 3:30 PM, Hauke Mehrtens <hauke at hauke-m.de> wrote:
> PKG_EXTMOD_SUBDIRS should be set to the sub directory where the kernel
> module gets build in, for the ath10k-ct driver this changed in commit
> 3888e77c1c68 from ath10k to ath10k-4.13. Without this fix the depends
> line of the ath10*.ko modules is empty and the kernel module load system
> will not automatically load the depended modules like mac80211.
>
> Fixes: 3888e77c1c68 ("ath10k-ct driver: use dma_alloc_coherent, 4.13 based driver")
> Fixes: 23a388fe41ec ("ath10k-ct: Force loading mac80211 and ath modules.")
> Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
> ---
>  package/kernel/ath10k-ct/Makefile | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
> index 8f9a8dd70f..fb2b8fafba 100644
> --- a/package/kernel/ath10k-ct/Makefile
> +++ b/package/kernel/ath10k-ct/Makefile
> @@ -12,15 +12,15 @@ PKG_SOURCE_DATE:=2017-06-13
>  PKG_SOURCE_VERSION:=e1edd74d5f0c5291b0be72c81033e74e267929d4
>  PKG_MIRROR_HASH:=945dc7110017a80c33cac20d9d2a9beda0a6a98b50178319403568098534e60a
>
> -PKG_MAINTAINER:=Ben Greear <greearb at candelatech.com>
> -PKG_BUILD_PARALLEL:=1
> -PKG_EXTMOD_SUBDIRS:=ath10k
> -
>  # Build the 4.13 ath10k-ct driver version.  Other options are "-4.9", 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.13"
>
> +PKG_MAINTAINER:=Ben Greear <greearb at candelatech.com>
> +PKG_BUILD_PARALLEL:=1
> +PKG_EXTMOD_SUBDIRS:=ath10k$(CT_KVER)
> +
>  STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
>
>  include $(INCLUDE_DIR)/kernel.mk
> @@ -33,7 +33,7 @@ define KernelPackage/ath10k-ct
>    FILES:=\
>         $(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
>         $(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
> -  AUTOLOAD:=$(call AutoProbe,mac80211 ath ath10k_pci)
> +  AUTOLOAD:=$(call AutoProbe,ath10k_pci)
>  endef
>
>  NOSTDINC_FLAGS = \
> --
> 2.11.0
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev