iwlwifi: fix MODULE_FIRMWARE for 6030
PATCH 2/2 iwlwifi: fix double hyphen in MODULE_FIRMWARE for 8000
In reply to Jürg BilleterThere is only a single hyphen between iwlwifi-8000C and the API version in the firmware filename.
--- 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
@@ -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
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.
--- 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
@@ -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
Hi Jürg,
Quoted 15 lines · Jürg Billeter
IWL6000G2B_UCODE_API_MAXis not defined.ucode_api_maxofIWL_DEVICE_6030usesIWL6000G2_UCODE_API_MAX. Use this also forMODULE_FIRMWARE.Fixes 9d9b21d1b616 ("iwlwifi: remove IWL_*_UCODE_API_OK")Signed-off-by Jürg Billeter <[email protected]>--- 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
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.