On Sat, Mar 6, 2021 at 8:48 PM Hugh Dickins <hu...@google.com> wrote:
>
> There is no iwl_so_trans_cfg if CONFIG_IWLDVM but not CONFIG_IWLMVM:
> move the CONFIG_IWLMVM guard up before the problematic SnJ workaround
> to fix the build breakage.
>
> Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices")
> Signed-off-by: Hugh Dickins <hu...@google.com>See "iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM is disabled" in [1]. - Sedat - [1] https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/commit/?id=62541e266703549550e77fd46138422dbdc881f1 > --- > > drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- 5.12-rc2/drivers/net/wireless/intel/iwlwifi/pcie/drv.c 2021-02-28 > 16:58:55.082425755 -0800 > +++ linux/drivers/net/wireless/intel/iwlwifi/pcie/drv.c 2021-03-05 > 18:42:53.650809293 -0800 > @@ -1106,6 +1106,7 @@ static int iwl_pci_probe(struct pci_dev > } > } > > +#if IS_ENABLED(CONFIG_IWLMVM) > /* > * Workaround for problematic SnJ device: sometimes when > * certain RF modules are connected to SnJ, the device ID > @@ -1116,7 +1117,6 @@ static int iwl_pci_probe(struct pci_dev > 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. > *
