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;
Subject: Re: [PATCH 5.12] iwlwifi: pcie: fix iwl_so_trans_cfg link error when
 CONFIG_IWLMVM is disabled
To:     Kalle Valo <kvalo@codeaurora.org>, linux-wireless@vger.kernel.org
Cc:     luciano.coelho@intel.com
References: <1614236661-20274-1-git-send-email-kvalo@codeaurora.org>
From:   Randy Dunlap <rdunlap@infradead.org>
Message-ID: <90a94fca-07db-85db-b532-f4248e3dca48@infradead.org>
Date:   Thu, 25 Feb 2021 08:46:54 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.0
MIME-Version: 1.0
In-Reply-To: <1614236661-20274-1-git-send-email-kvalo@codeaurora.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2/24/21 11:04 PM, Kalle Valo wrote:
> Randy reported an error on his randconfig builds:
> 
> ERROR: modpost: "iwl_so_trans_cfg" [drivers/net/wireless/intel/iwlwifi/iwlwifi.ko] undefined!
> 
> The problem was that when CONFIG_IWLMVM was disabled we were still accessing
> iwl_so_trans_cfg. Fix it by moving IS_ENABLED() check before the access.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Thanks.

> ---
>  drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> index 314fec4a89ad..ffaf973dae94 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> @@ -1106,6 +1106,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  		}
>  	}
>  
> +#if IS_ENABLED(CONFIG_IWLMVM)
> +
>  	/*
>  	 * Workaround for problematic SnJ device: sometimes when
>  	 * certain RF modules are connected to SnJ, the device ID
> @@ -1116,7 +1118,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	if (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)
>  	/*
>  	 * special-case 7265D, it has the same PCI IDs.
>  	 *
> 


-- 
~Randy