leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlagn: add correct firmware name for 135 series

Browse Source 
135 series are WiFi/BT combo and require different uCode from 105 series.
[A
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Wey-Yi Guy 2011-07-01 07:47:59 -07:00
parent 4466320f05
commit 54e9c409a5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/iwlwifi/iwl-2000.c
View File

@ -50,11 +50,13 @@
#define IWL2030_UCODE_API_MAX 5 #define IWL2030_UCODE_API_MAX 5
#define IWL2000_UCODE_API_MAX 5 #define IWL2000_UCODE_API_MAX 5
#define IWL105_UCODE_API_MAX 5 #define IWL105_UCODE_API_MAX 5
#define IWL135_UCODE_API_MAX 5
/* Lowest firmware API version supported */ /* Lowest firmware API version supported */
#define IWL2030_UCODE_API_MIN 5 #define IWL2030_UCODE_API_MIN 5
#define IWL2000_UCODE_API_MIN 5 #define IWL2000_UCODE_API_MIN 5
#define IWL105_UCODE_API_MIN 5 #define IWL105_UCODE_API_MIN 5
#define IWL135_UCODE_API_MIN 5
#define IWL2030_FW_PRE "iwlwifi-2030-" #define IWL2030_FW_PRE "iwlwifi-2030-"
#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE __stringify(api) ".ucode" #define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE __stringify(api) ".ucode"
@ -65,6 +67,9 @@
#define IWL105_FW_PRE "iwlwifi-105-" #define IWL105_FW_PRE "iwlwifi-105-"
#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode" #define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode"
#define IWL135_FW_PRE "iwlwifi-135-"
#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE #api ".ucode"
static void iwl2000_set_ct_threshold(struct iwl_priv *priv) static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
{ {
/* want Celsius */ /* want Celsius */
@ -344,9 +349,9 @@ struct iwl_cfg iwl105_bgn_cfg = {
}; };
#define IWL_DEVICE_135 \ #define IWL_DEVICE_135 \
.fw_name_pre = IWL105_FW_PRE, \ .fw_name_pre = IWL135_FW_PRE, \
.ucode_api_max = IWL105_UCODE_API_MAX, \ .ucode_api_max = IWL135_UCODE_API_MAX, \
.ucode_api_min = IWL105_UCODE_API_MIN, \ .ucode_api_min = IWL135_UCODE_API_MIN, \
.eeprom_ver = EEPROM_2000_EEPROM_VERSION, \ .eeprom_ver = EEPROM_2000_EEPROM_VERSION, \
.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \ .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION, \
.ops = &iwl135_ops, \ .ops = &iwl135_ops, \
@ -359,12 +364,12 @@ struct iwl_cfg iwl105_bgn_cfg = {
.rx_with_siso_diversity = true \ .rx_with_siso_diversity = true \
struct iwl_cfg iwl135_bg_cfg = { struct iwl_cfg iwl135_bg_cfg = {
.name = "105 Series 1x1 BG/BT", .name = "135 Series 1x1 BG/BT",
IWL_DEVICE_135, IWL_DEVICE_135,
}; };
struct iwl_cfg iwl135_bgn_cfg = { struct iwl_cfg iwl135_bgn_cfg = {
.name = "105 Series 1x1 BGN/BT", .name = "135 Series 1x1 BGN/BT",
IWL_DEVICE_135, IWL_DEVICE_135,
.ht_params = &iwl2000_ht_params, .ht_params = &iwl2000_ht_params,
}; };
@ -372,3 +377,4 @@ struct iwl_cfg iwl135_bgn_cfg = {
MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));
MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX)); MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));
MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX)); MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));
MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_MAX));