From patchwork Thu Feb 25 14:30:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 387216 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp359836jap; Thu, 25 Feb 2021 06:33:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDsMUc1xS215IDXaG4Xm+/rlMMCanUvDAeWqQHX3RFhUsaNE1izYdp7+0jw0wlVyyOjlTT X-Received: by 2002:a17:907:2d10:: with SMTP id gs16mr2984635ejc.0.1614263608436; Thu, 25 Feb 2021 06:33:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614263608; cv=none; d=google.com; s=arc-20160816; b=aLJHVMqsQtotatAoJx1o4bXH96BpPIHk0iWXVwkSuqXMDN4i8tZ+UDc8zUVpdMIGrL VsfYd8ZN7zvPqks84FeljwpJQZGKK8bPryub5TmWSyfrWnIripa+azDMtt9OaJMe2lII Oinxkt5WsX76mYnpu6HNdYwPzJol/SJ3yx9+GdPJ/k6/F5MMmQCoXNOQ1AukHZ2rXFvR rRoYUPkl75JJsTS27GuGCwAP2sPGM0YAX35YUWiQTygthZ6rIpFasSZ13IEcVtEo+5So MvC3DaL4/e3ZRaCr+DEQg3UPzghTEoi+AMjdQ/1aPR5tVhJ3FiKxV561r9ayLGuavbFz 1KmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=6wI3+SPtplnWWB9hjk8mV6waNC48G9S7uyTwb6xVw60=; b=AjniCDSL4cH02TE5UBdEXzndjaqCJ/Ph4uXdabismKkcR19MFMRmrPnIJGKvF7LufL 7Y4Rf7eQfuFqELiWhvF9Vbe3tqO2AlDL+2Y6+W88wKsse0gf7Hry7Mt7vg2DBLxNJokE go7J/5njbDBwcEdeNwhXat5nSTu4All8pZc4fb8sE6XXWA25u3Dr4vTGxpGbYwdZff28 5VJnBtw/0mvPyaEc1z3LgC+pmEESlVGXNkoE+MXi8qZ3lx8Pcg/lSNUU9FqGqKQfAti4 E+2dP3Fg2F1bS5UDkEYic3NwsSS/YZhENRaF+uaZbgPYXo/a8SkxFoTuekujm94znnpM nbxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KtBrUgSQ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w16si3384965edi.602.2021.02.25.06.33.28; Thu, 25 Feb 2021 06:33:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KtBrUgSQ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231787AbhBYOdZ (ORCPT + 2 others); Thu, 25 Feb 2021 09:33:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:56182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231248AbhBYOdX (ORCPT ); Thu, 25 Feb 2021 09:33:23 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3605F64EC3; Thu, 25 Feb 2021 14:32:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614263563; bh=TF7d3kZU11RlL3LhvGBRVe0/IJ+uPtdyR01vC/FT4Yg=; h=From:To:Cc:Subject:Date:From; b=KtBrUgSQUgZ9+zFzuHDlo3UHDZmV/rN8FadNXWDIO+eYlzXbRQqgbu+KFui3yY474 wrXr/3tUOoJZJVxpxouz9P4cZRjii26iJPqahoUxMfzrySTxknbIeFkGB80uJNF4wf 8NCfZkOxKBeOcURlHmgnG1Z5cUSfJTY/cRQguGGz7kk97Y/DoFddKhAKKeWtpdme0q n0dU9PQAElNgHPcrT2H+iaGtT2I6/9c3DI+7IL4+Nt1cMQhZTaq1dq6O6ByjJmZS+W 6UpQPJdQYyh+TZQSqZoUi+9cVHZJoMGDN92Kk8qps9LFcAI+brgjxHxKfF6fitFNfl LnJWxlYZvHLxw== From: Arnd Bergmann To: Luca Coelho , Kalle Valo , "David S. Miller" , Jakub Kicinski Cc: Arnd Bergmann , Ihab Zhaika , Matti Gottlieb , Johannes Berg , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] iwlwifi: fix link error without CONFIG_IWLMVM Date: Thu, 25 Feb 2021 15:30:37 +0100 Message-Id: <20210225143236.3543360-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Arnd Bergmann A runtime check that was introduced recently failed to check for the matching Kconfig symbol: ld.lld: error: undefined symbol: iwl_so_trans_cfg >>> referenced by drv.c >>> net/wireless/intel/iwlwifi/pcie/drv.o:(iwl_pci_probe) Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices") Signed-off-by: Arnd Bergmann --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.29.2 diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 314fec4a89ad..a2f5c4fc2324 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1113,7 +1113,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * here. But if we detect that the MAC type is actually SnJ, * we should switch to it here to avoid problems later. */ - if (CSR_HW_REV_TYPE(iwl_trans->hw_rev) == IWL_CFG_MAC_TYPE_SNJ) + if (IS_ENABLED(CONFIG_IWLMVM) && + CSR_HW_REV_TYPE(iwl_trans->hw_rev) == IWL_CFG_MAC_TYPE_SNJ) iwl_trans->trans_cfg = &iwl_so_trans_cfg; #if IS_ENABLED(CONFIG_IWLMVM)