From patchwork Thu Mar 22 22:30:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 889694 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="soCfeqEk"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 406hGv4Vh5z9s1P for ; Fri, 23 Mar 2018 09:31:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=txzUI8Azo7ZMat6XTYjjiuzSnDJZ/8J7xnWIxI/NBN8=; b=soCfeqEkx39nJX M4kKHrLHOv2uhd7992h8CNB3Afehp3EDU73nwRmeS8Uy+UQ5geS0f2OPeAFG0HrKYvJOcZA3HusqG jL7s8m1z8LVT0cBsgbytxruTnQuvZiM8yPkHztrajDhS+YUSKtAF9FxQgSoDOoFxFp2sQceqtlr+t Z1geneMwid+HXQvYfv31PCrYem0TXC6n9PaAAYMIlSoRtuQvVooD/iv+shuUNSsj5+vmybA8iGIp7 OZ4HwA7o2zS/JNMET7UuqqwHa9wUtc2egbdMKK07vGQMdmnsz5XIUvEj8sZJv6TPyJhka2QOg5lb7 kkrH8qc+Ll6IAPHDqUVA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ez8jv-00012H-7P; Thu, 22 Mar 2018 22:31:19 +0000 Received: from mx1.mailbox.org ([80.241.60.212]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ez8jq-00010G-Ed for lede-dev@lists.infradead.org; Thu, 22 Mar 2018 22:31:16 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 3777B42B4F; Thu, 22 Mar 2018 23:31:01 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id ME_4l4PiIfMp; Thu, 22 Mar 2018 23:30:47 +0100 (CET) From: Hauke Mehrtens To: lede-dev@lists.infradead.org Date: Thu, 22 Mar 2018 23:30:31 +0100 Message-Id: <20180322223031.9345-1-hauke@hauke-m.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180322_153114_856769_97AFB1FD X-CRM114-Status: GOOD ( 18.07 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [80.241.60.212 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [LEDE-DEV] [PATCH] ath10k-ct: fix module depends X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens , greearb@candelatech.com MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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 --- 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 -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 +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 = \