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

Commit 4bf775cd authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: Take the fw file name from the iwl_cfg. 



This patch adds fw_name to iwl_cfg. This allows run time selection
of needed fw/ucode file

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 82b9a121

drivers/net/wireless/iwlwifi/iwl-3945.c

+2 −0
Original line number Diff line number Diff line
@@ -2526,11 +2526,13 @@ void iwl3945_hw_cancel_deferred_work(struct iwl3945_priv *priv) 


static struct iwl_3945_cfg iwl3945_bg_cfg = {

	.name = "3945BG",

	.fw_name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode",

	.sku = IWL_SKU_G,

};



static struct iwl_3945_cfg iwl3945_abg_cfg = {

	.name = "3945ABG",

	.fw_name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode",

	.sku = IWL_SKU_A|IWL_SKU_G,

};

drivers/net/wireless/iwlwifi/iwl-3945.h

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ extern struct pci_device_id iwl3945_hw_card_ids[]; 
#include "iwl-3945-hw.h"

#include "iwl-3945-debug.h"



/* Change firmware file name, using "-" and incrementing number,

 *   *only* when uCode interface or architecture changes so that it

 *   is not compatible with earlier drivers.

 * This number will also appear in << 8 position of 1st dword of uCode file */

#define IWL3945_UCODE_API "-1"



/* Default noise level to report when noise measurement is not available.

 *   This may be because we're:

 *   1)  Not associated (4965, no beacon statistics being sent to driver)

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −0
Original line number Diff line number Diff line
@@ -4823,6 +4823,7 @@ void iwl4965_hw_cancel_deferred_work(struct iwl4965_priv *priv) 


static struct iwl_cfg iwl4965_agn_cfg = {

	.name = "4965AGN",

	.fw_name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode",

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

};

drivers/net/wireless/iwlwifi/iwl-4965.h

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ extern struct pci_device_id iwl4965_hw_card_ids[]; 
#include "iwl-prph.h"

#include "iwl-4965-debug.h"



/* Change firmware file name, using "-" and incrementing number,

 *   *only* when uCode interface or architecture changes so that it

 *   is not compatible with earlier drivers.

 * This number will also appear in << 8 position of 1st dword of uCode file */

#define IWL4965_UCODE_API "-1"





/* Default noise level to report when noise measurement is not available.

 *   This may be because we're:

 *   1)  Not associated (4965, no beacon statistics being sent to driver)

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −6
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ int iwl3945_param_queues_num = IWL_MAX_NUM_QUEUES; /* def: 8 Tx queues */ 
#define DRV_COPYRIGHT	"Copyright(c) 2003-2007 Intel Corporation"

#define DRV_VERSION     IWLWIFI_VERSION



/* Change firmware file name, using "-" and incrementing number,

 *   *only* when uCode interface or architecture changes so that it

 *   is not compatible with earlier drivers.

 * This number will also appear in << 8 position of 1st dword of uCode file */

#define IWL3945_UCODE_API "-1"



MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_VERSION(DRV_VERSION);
@@ -5621,7 +5616,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv) 
	int ret = 0;

	const struct firmware *ucode_raw;

	/* firmware file name contains uCode/driver compatibility version */

	const char *name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode";

	const char *name = priv->cfg->fw_name;

	u8 *src;

	size_t len;

	u32 ver, inst_size, data_size, init_size, init_data_size, boot_size;