aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 0cdc7f84b5af..a130f5d077f0 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -96,11 +96,6 @@ int iwl3945_param_queues_num = IWL_MAX_NUM_QUEUES; /* def: 8 Tx queues */
96#define DRV_COPYRIGHT "Copyright(c) 2003-2007 Intel Corporation" 96#define DRV_COPYRIGHT "Copyright(c) 2003-2007 Intel Corporation"
97#define DRV_VERSION IWLWIFI_VERSION 97#define DRV_VERSION IWLWIFI_VERSION
98 98
99/* Change firmware file name, using "-" and incrementing number,
100 * *only* when uCode interface or architecture changes so that it
101 * is not compatible with earlier drivers.
102 * This number will also appear in << 8 position of 1st dword of uCode file */
103#define IWL3945_UCODE_API "-1"
104 99
105MODULE_DESCRIPTION(DRV_DESCRIPTION); 100MODULE_DESCRIPTION(DRV_DESCRIPTION);
106MODULE_VERSION(DRV_VERSION); 101MODULE_VERSION(DRV_VERSION);
@@ -5621,7 +5616,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
5621 int ret = 0; 5616 int ret = 0;
5622 const struct firmware *ucode_raw; 5617 const struct firmware *ucode_raw;
5623 /* firmware file name contains uCode/driver compatibility version */ 5618 /* firmware file name contains uCode/driver compatibility version */
5624 const char *name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode"; 5619 const char *name = priv->cfg->fw_name;
5625 u8 *src; 5620 u8 *src;
5626 size_t len; 5621 size_t len;
5627 u32 ver, inst_size, data_size, init_size, init_data_size, boot_size; 5622 u32 ver, inst_size, data_size, init_size, init_data_size, boot_size;