| From d2c8b15d0cb486f4938ba7f2af349d9d1220cb10 Mon Sep 17 00:00:00 2001 |
| From: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> |
| Date: Tue, 5 Jun 2012 20:24:37 +0200 |
| Subject: iwlwifi: use correct supported firmware for 6035 and 6000g2 |
| |
| From: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> |
| |
| commit d2c8b15d0cb486f4938ba7f2af349d9d1220cb10 upstream. |
| |
| My patch |
| |
| iwlwifi: use correct released ucode version |
| |
| did not correctly report supported firmware |
| for the 6035 device. This patch fixes it. The |
| minimum supported firmware version for 6035 |
| is v6. |
| |
| Also correct the minimum supported firmware |
| version for the 6000g2 series of devices. |
| |
| Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> |
| Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/iwlwifi/iwl-6000.c | 23 +++++++++++++++++++++-- |
| 1 file changed, 21 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/wireless/iwlwifi/iwl-6000.c |
| +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c |
| @@ -49,17 +49,20 @@ |
| #define IWL6000_UCODE_API_MAX 6 |
| #define IWL6050_UCODE_API_MAX 5 |
| #define IWL6000G2_UCODE_API_MAX 6 |
| +#define IWL6035_UCODE_API_MAX 6 |
| |
| /* Oldest version we won't warn about */ |
| #define IWL6000_UCODE_API_OK 4 |
| #define IWL6000G2_UCODE_API_OK 5 |
| #define IWL6050_UCODE_API_OK 5 |
| #define IWL6000G2B_UCODE_API_OK 6 |
| +#define IWL6035_UCODE_API_OK 6 |
| |
| /* Lowest firmware API version supported */ |
| #define IWL6000_UCODE_API_MIN 4 |
| #define IWL6050_UCODE_API_MIN 4 |
| -#define IWL6000G2_UCODE_API_MIN 4 |
| +#define IWL6000G2_UCODE_API_MIN 5 |
| +#define IWL6035_UCODE_API_MIN 6 |
| |
| #define IWL6000_FW_PRE "iwlwifi-6000-" |
| #define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode" |
| @@ -425,9 +428,25 @@ const struct iwl_cfg iwl6030_2bg_cfg = { |
| IWL_DEVICE_6030, |
| }; |
| |
| +#define IWL_DEVICE_6035 \ |
| + .fw_name_pre = IWL6030_FW_PRE, \ |
| + .ucode_api_max = IWL6035_UCODE_API_MAX, \ |
| + .ucode_api_ok = IWL6035_UCODE_API_OK, \ |
| + .ucode_api_min = IWL6035_UCODE_API_MIN, \ |
| + .max_inst_size = IWL60_RTC_INST_SIZE, \ |
| + .max_data_size = IWL60_RTC_DATA_SIZE, \ |
| + .eeprom_ver = EEPROM_6030_EEPROM_VERSION, \ |
| + .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION, \ |
| + .lib = &iwl6030_lib, \ |
| + .base_params = &iwl6000_g2_base_params, \ |
| + .bt_params = &iwl6000_bt_params, \ |
| + .need_temp_offset_calib = true, \ |
| + .led_mode = IWL_LED_RF_STATE, \ |
| + .adv_pm = true |
| + |
| const struct iwl_cfg iwl6035_2agn_cfg = { |
| .name = "Intel(R) Centrino(R) Advanced-N 6235 AGN", |
| - IWL_DEVICE_6030, |
| + IWL_DEVICE_6035, |
| .ht_params = &iwl6000_ht_params, |
| }; |
| |