[ 163/167] [PATCH] iwlwifi: use 6000G2B for 6030 device series
From: Ben Hutchings <hidden>
Date: 2012-05-09 06:14:43
Also in:
lkml
3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wey-Yi Guy <redacted> commit 1ed2ec37b44e86eaa8e0a03b908a39c80f65ee45 upstream. "iwlwifi: use correct released ucode version" change the ucode api ok from 6000G2 to 6000G2B, but it shall belong to 6030 device series, not the 6005 device series. Fix it Signed-off-by: Wey-Yi Guy <redacted> Signed-off-by: John W. Linville <redacted> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <redacted> --- drivers/net/wireless/iwlwifi/iwl-6000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- linux.orig/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ linux/drivers/net/wireless/iwlwifi/iwl-6000.c@@ -361,7 +361,7 @@ #define IWL_DEVICE_6005 \ .fw_name_pre = IWL6005_FW_PRE, \ .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ - .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \ + .ucode_api_ok = IWL6000G2_UCODE_API_OK, \ .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ .eeprom_ver = EEPROM_6005_EEPROM_VERSION, \ .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION, \
@@ -402,7 +402,7 @@ #define IWL_DEVICE_6030 \ .fw_name_pre = IWL6030_FW_PRE, \ .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ - .ucode_api_ok = IWL6000G2_UCODE_API_OK, \ + .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \ .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ .eeprom_ver = EEPROM_6030_EEPROM_VERSION, \ .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION, \