| Message ID | 1445190425.31451.70.camel@decadent.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
On Sun, 2015-10-18 at 18:47 +0100, Ben Hutchings wrote: > IWL3160_UCODE_API_OK is no longer defined, so we end up with this > in the module information: > > firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode > > It looks like IWL7260_UCODE_API_OK should be used instead now. [...] Somewhat relatedly, I noticed that iwlwifi is now requesting firmware files that aren't yet in linux-firmware.git. Please can you submit them for inclusion? Ben.
On Sun, Oct 18, 2015 at 8:47 PM, Ben Hutchings <ben@decadent.org.uk> wrote: > > IWL3160_UCODE_API_OK is no longer defined, so we end up with this > in the module information: > > firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode > > It looks like IWL7260_UCODE_API_OK should be used instead now. > > Fixes: ed65918735a5 ("iwlwifi: 7000: modify the firmware name for 3165") > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> picked up. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 10/18/2015 09:33 PM, Ben Hutchings wrote: > On Sun, 2015-10-18 at 18:47 +0100, Ben Hutchings wrote: >> IWL3160_UCODE_API_OK is no longer defined, so we end up with this >> in the module information: >> >> firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode >> >> It looks like IWL7260_UCODE_API_OK should be used instead now. > [...] > > Somewhat relatedly, I noticed that iwlwifi is now requesting firmware > files that aren't yet in linux-firmware.git. Please can you submit > them for inclusion? > This is a good point but the firmware filename is now changing too rapidly (every 6 weeks) to include all of them into linux-firmware.git. So we chose the firmware version that are the most stable and that correspond to a certain kernel. E.g. I won't upstream -16.ucode since 4.2 can handle 15 and 4.3 can already handle 17. That's the compromise we found. Note that all the firmware versions are available in our linux-firmware.git clone. Right now, I am waiting for -17.ucode to stabilize before upstreaming it. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c index cc35f79..d7acbd1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/iwlwifi/iwl-7000.c @@ -348,6 +348,6 @@ const struct iwl_cfg iwl7265d_n_cfg = { }; MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK)); -MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK)); +MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_OK)); MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK)); MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
IWL3160_UCODE_API_OK is no longer defined, so we end up with this in the module information: firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode It looks like IWL7260_UCODE_API_OK should be used instead now. Fixes: ed65918735a5 ("iwlwifi: 7000: modify the firmware name for 3165") Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)