Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e357bc authored by Thomas Backlund's avatar Thomas Backlund Committed by Greg Kroah-Hartman
Browse files

iwlwifi: fix firmware names for 9000 and A000 series hw 



commit c2c48ddfc8b03b9ecb51d2832b586497b37531bc upstream.

iwlwifi 9000 and a0000 series hw contains an extra dash in firmware
file name as seeen in modinfo output for kernel 4.14:

firmware:       iwlwifi-9260-th-b0-jf-b0--34.ucode
firmware:       iwlwifi-9260-th-a0-jf-a0--34.ucode
firmware:       iwlwifi-9000-pu-a0-jf-b0--34.ucode
firmware:       iwlwifi-9000-pu-a0-jf-a0--34.ucode
firmware:       iwlwifi-QuQnj-a0-hr-a0--34.ucode
firmware:       iwlwifi-QuQnj-a0-jf-b0--34.ucode
firmware:       iwlwifi-QuQnj-f0-hr-a0--34.ucode
firmware:       iwlwifi-Qu-a0-jf-b0--34.ucode
firmware:       iwlwifi-Qu-a0-hr-a0--34.ucode

Fix that by dropping the extra adding of '"-"'.

Signed-off-by: default avatarThomas Backlund <tmb@mageia.org>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 404dcc55

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+3 −3
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ 
#define IWL9000_MODULE_FIRMWARE(api) \

	IWL9000_FW_PRE "-" __stringify(api) ".ucode"

#define IWL9000RFB_MODULE_FIRMWARE(api) \

	IWL9000RFB_FW_PRE "-" __stringify(api) ".ucode"

	IWL9000RFB_FW_PRE __stringify(api) ".ucode"

#define IWL9260A_MODULE_FIRMWARE(api) \

	IWL9260A_FW_PRE "-" __stringify(api) ".ucode"

	IWL9260A_FW_PRE __stringify(api) ".ucode"

#define IWL9260B_MODULE_FIRMWARE(api) \

	IWL9260B_FW_PRE "-" __stringify(api) ".ucode"

	IWL9260B_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_9000		10

drivers/net/wireless/intel/iwlwifi/cfg/a000.c

+5 −5
Original line number Diff line number Diff line
@@ -80,15 +80,15 @@ 
#define IWL_A000_HR_A0_FW_PRE	"iwlwifi-QuQnj-a0-hr-a0-"



#define IWL_A000_HR_MODULE_FIRMWARE(api) \

	IWL_A000_HR_FW_PRE "-" __stringify(api) ".ucode"

	IWL_A000_HR_FW_PRE __stringify(api) ".ucode"

#define IWL_A000_JF_MODULE_FIRMWARE(api) \

	IWL_A000_JF_FW_PRE "-" __stringify(api) ".ucode"

	IWL_A000_JF_FW_PRE __stringify(api) ".ucode"

#define IWL_A000_HR_F0_QNJ_MODULE_FIRMWARE(api) \

	IWL_A000_HR_F0_FW_PRE "-" __stringify(api) ".ucode"

	IWL_A000_HR_F0_FW_PRE __stringify(api) ".ucode"

#define IWL_A000_JF_B0_QNJ_MODULE_FIRMWARE(api) \

	IWL_A000_JF_B0_FW_PRE "-" __stringify(api) ".ucode"

	IWL_A000_JF_B0_FW_PRE __stringify(api) ".ucode"

#define IWL_A000_HR_A0_QNJ_MODULE_FIRMWARE(api) \

	IWL_A000_HR_A0_FW_PRE "-" __stringify(api) ".ucode"

	IWL_A000_HR_A0_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_A000		10