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;
MIME-Version: 1.0
References: <alpine.LSU.2.11.2103061139200.1285@eggly.anvils>
In-Reply-To: <alpine.LSU.2.11.2103061139200.1285@eggly.anvils>
Reply-To: sedat.dilek@gmail.com
From:   Sedat Dilek <sedat.dilek@gmail.com>
Date:   Sat, 6 Mar 2021 20:52:15 +0100
Message-ID: <CA+icZUVedsZzJ7qk4fgSZV37M6YUjnP=sfWFK9V9f0y0KpQ4tA@mail.gmail.com>
Subject: Re: [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc
To:     Hugh Dickins <hughd@google.com>
Cc:     Luca Coelho <luciano.coelho@intel.com>,
        Kalle Valo <kvalo@codeaurora.org>,
        Mordechay Goodstein <mordechay.goodstein@intel.com>,
        Jiri Kosina <jikos@kernel.org>, linux-wireless@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sat, Mar 6, 2021 at 8:48 PM Hugh Dickins <hughd@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 <hughd@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.
>          *