Skip to contentSkip to conversation

iwlwifi: fix MODULE_FIRMWARE for 6030

PATCH In review Jürg Billeter 2 participants 3 messages Oct 10, 2016 – Nov 11, 2016 Intel wireless wifi link (iwlwifi)

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iwlwifi: fix MODULE_FIRMWARE for 6030

IWL6000G2B_UCODE_API_MAX is not defined. ucode_api_max of IWL_DEVICE_6030 uses IWL6000G2_UCODE_API_MAX. Use this also for MODULE_FIRMWARE.

Fixes 9d9b21d1b616 ("iwlwifi: remove IWL_*_UCODE_API_OK")
---
 drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-6000.c +1 -1
index 0b9f6a7..39335b7 100644
@@ -371,4 +371,4 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
Signature · 1 line
2.10.1
#1 lore raw

PATCH 2/2 iwlwifi: fix double hyphen in MODULE_FIRMWARE for 8000

There is only a single hyphen between iwlwifi-8000C and the API version in the firmware filename.

Fixes e1ba684f762b ("iwlwifi: 8000: fix MODULE_FIRMWARE input")
---
 drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-8000.c +1 -1
index d02ca14..8d3e53f 100644
@@ -91,7 +91,7 @@
 
 #define IWL8000_FW_PRE "iwlwifi-8000C-"
 #define IWL8000_MODULE_FIRMWARE(api) \
-	IWL8000_FW_PRE "-" __stringify(api) ".ucode"
+	IWL8000_FW_PRE __stringify(api) ".ucode"
 
 #define IWL8265_FW_PRE "iwlwifi-8265-"
 #define IWL8265_MODULE_FIRMWARE(api) \
Signature · 1 line
2.10.1
#2 lore raw
In reply to Jürg Billeter

Hi Jürg,

Quoted 15 lines · Jürg Billeter

IWL6000G2B_UCODE_API_MAX is not defined. ucode_api_max of IWL_DEVICE_6030 uses IWL6000G2_UCODE_API_MAX. Use this also for MODULE_FIRMWARE.

Fixes 9d9b21d1b616 ("iwlwifi: remove IWL_*_UCODE_API_OK")
---
 drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-6000.c +0 -0
index 0b9f6a7..39335b7 100644

drivers/net/wireless/intel/iwlwifi/iwl-6000.c const struct iwl_cfg iwl6000_3agn_cfg = { · line 374

Quoted 5 lines
drivers/net/wireless/intel/iwlwifi/iwl-6000.c +1 -1
@@ -371,4 +371,4 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));

Sorry I had missed these patches because linux-wireless@vger was not CCed, so it didn't get to patchwork. I have applied both in our internal tree and they'll reach the mainline in my next pull-request.

Thanks!

--
Cheers,
Luca.