diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 08afedf4b3ec..381b02cf339c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -39,6 +39,8 @@ | |||
39 | /* Oldest version we won't warn about */ | 39 | /* Oldest version we won't warn about */ |
40 | #define IWL6000_UCODE_API_OK 4 | 40 | #define IWL6000_UCODE_API_OK 4 |
41 | #define IWL6000G2_UCODE_API_OK 5 | 41 | #define IWL6000G2_UCODE_API_OK 5 |
42 | #define IWL6050_UCODE_API_OK 5 | ||
43 | #define IWL6000G2B_UCODE_API_OK 6 | ||
42 | 44 | ||
43 | /* Lowest firmware API version supported */ | 45 | /* Lowest firmware API version supported */ |
44 | #define IWL6000_UCODE_API_MIN 4 | 46 | #define IWL6000_UCODE_API_MIN 4 |
@@ -190,7 +192,7 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = { | |||
190 | #define IWL_DEVICE_6030 \ | 192 | #define IWL_DEVICE_6030 \ |
191 | .fw_name_pre = IWL6030_FW_PRE, \ | 193 | .fw_name_pre = IWL6030_FW_PRE, \ |
192 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ | 194 | .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ |
193 | .ucode_api_ok = IWL6000G2_UCODE_API_OK, \ | 195 | .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \ |
194 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ | 196 | .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ |
195 | .device_family = IWL_DEVICE_FAMILY_6030, \ | 197 | .device_family = IWL_DEVICE_FAMILY_6030, \ |
196 | .max_inst_size = IWL60_RTC_INST_SIZE, \ | 198 | .max_inst_size = IWL60_RTC_INST_SIZE, \ |
@@ -356,6 +358,6 @@ const struct iwl_cfg iwl6000_3agn_cfg = { | |||
356 | }; | 358 | }; |
357 | 359 | ||
358 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK)); | 360 | MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK)); |
359 | MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); | 361 | MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_OK)); |
360 | MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); | 362 | MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_OK)); |
361 | MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); | 363 | MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_OK)); |