diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-11-30 09:33:40 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-30 13:58:18 -0500 |
commit | 61790c5f3c5f158821821a00797d94504531839f (patch) | |
tree | 32d7d180f4390e7af7460a34ca81be55110ca2f9 /drivers | |
parent | 08ca944eb240b2299e743c76b43fbc7c2dd251de (diff) |
iwlagn: fix microcode error on 4965
Commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 "iwlwifi: use
antenna information in EEPROM" caused 4965 device breakage with
"Microcode SW error detected. Restarting 0x82000000." message.
This patch reverts 4965 part of that commit.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 9f1d8d8c8fcc..6788ceb37686 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -2624,6 +2624,8 @@ struct iwl_cfg iwl4965_agn_cfg = { | |||
2624 | .fw_name_pre = IWL4965_FW_PRE, | 2624 | .fw_name_pre = IWL4965_FW_PRE, |
2625 | .ucode_api_max = IWL4965_UCODE_API_MAX, | 2625 | .ucode_api_max = IWL4965_UCODE_API_MAX, |
2626 | .ucode_api_min = IWL4965_UCODE_API_MIN, | 2626 | .ucode_api_min = IWL4965_UCODE_API_MIN, |
2627 | .valid_tx_ant = ANT_AB, | ||
2628 | .valid_rx_ant = ANT_ABC, | ||
2627 | .eeprom_ver = EEPROM_4965_EEPROM_VERSION, | 2629 | .eeprom_ver = EEPROM_4965_EEPROM_VERSION, |
2628 | .eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION, | 2630 | .eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION, |
2629 | .ops = &iwl4965_ops, | 2631 | .ops = &iwl4965_ops, |