modinfo iwlwifi showed the following required firmware:
firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode
Signed-off-by: Hauke Mehrtens <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 6951aba..bccd2d2 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(IWL3165_UCODE_API_OK));
MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
--
2.1.4
On 09/22/2015 10:46 AM, Johannes Berg wrote:
> On Tue, 2015-09-22 at 10:44 +0200, Johannes Berg wrote:
>> On Sat, 2015-09-19 at 12:39 +0200, Hauke Mehrtens wrote:
>>> modinfo iwlwifi showed the following required firmware:
>>> firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode
>>
>> This is obviously wrong.
>>
>>>
>>> MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
>>> -MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
>>> +MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3165_UCODE_API_OK));
>>>
>> But this is also wrong, it should be 7260, and there should be a
>> separate entry for 3165. I'll get a patch on the way to fix it.
>>
>
> Actually, no, there shouldn't be another entry since 3165 uses the same
> firmware as 7265-D.
>
> johannes
Should I change something?
iwl3165 uses iwl3160 firmware, but support for that was added in rev 13
of that firmware. That's the information I got from the driver and the
linux-firmware commit messages.
Hauke
On Sat, 2015-09-19 at 12:39 +0200, Hauke Mehrtens wrote:
> modinfo iwlwifi showed the following required firmware:
> firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode
This is obviously wrong.
>
> MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
> -MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
> +MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3165_UCODE_API_OK));
>
But this is also wrong, it should be 7260, and there should be a
separate entry for 3165. I'll get a patch on the way to fix it.
johannes
>
> Should I change something?
No, I already created a different patch to make it simply use the 7260
number instead of the 3165 one. I also made one, in fact, to get rid of
the 3165 since that has the same values anyway.
> iwl3165 uses iwl3160 firmware, but support for that was added in rev
> 13 of that firmware. That's the information I got from the driver and
> the linux-firmware commit messages.
>
Ah. it may be that we have changed this internally vs. upstream, need
to check on that. Actually, Luca will just find out when he tries to
upstream my changes :)
johannes
On Tue, 2015-09-22 at 10:44 +0200, Johannes Berg wrote:
> On Sat, 2015-09-19 at 12:39 +0200, Hauke Mehrtens wrote:
> > modinfo iwlwifi showed the following required firmware:
> > firmware: iwlwifi-3160-IWL3160_UCODE_API_OK.ucode
>
> This is obviously wrong.
>
> >
> > MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
> > -MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
> > +MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3165_UCODE_API_OK));
> >
> But this is also wrong, it should be 7260, and there should be a
> separate entry for 3165. I'll get a patch on the way to fix it.
>
Actually, no, there shouldn't be another entry since 3165 uses the same
firmware as 7265-D.
johannes
On Tue, 2015-09-22 at 21:16 +0200, Johannes Berg wrote:
> >
> > Should I change something?
>
> No, I already created a different patch to make it simply use the
> 7260
> number instead of the 3165 one. I also made one, in fact, to get rid
> of
> the 3165 since that has the same values anyway.
>
> > iwl3165 uses iwl3160 firmware, but support for that was added in
> > rev
> > 13 of that firmware. That's the information I got from the driver
> > and
> > the linux-firmware commit messages.
> >
>
> Ah. it may be that we have changed this internally vs. upstream, need
> to check on that. Actually, Luca will just find out when he tries to
> upstream my changes :)
Just saw this now because... I'm preparing our patches for upstreaming.
:)
But I didn't notice anything regarding this when I cherry-picked your
patch for upstreaming. Did I miss something?
--
Luca.