iwlagn: fix microcode error on 4965
authorStanislaw Gruszka <sgruszka@redhat.com>
Tue, 30 Nov 2010 14:33:40 +0000 (15:33 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 30 Nov 2010 18:58:18 +0000 (13:58 -0500)
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>
drivers/net/wireless/iwlwifi/iwl-4965.c

index 9f1d8d8c8fcceb2b1c9e8862e200de0ed81e8c3e..6788ceb37686a4cfe6fe135f8af0201a68e1ab28 100644 (file)
@@ -2624,6 +2624,8 @@ struct iwl_cfg iwl4965_agn_cfg = {
        .fw_name_pre = IWL4965_FW_PRE,
        .ucode_api_max = IWL4965_UCODE_API_MAX,
        .ucode_api_min = IWL4965_UCODE_API_MIN,
+       .valid_tx_ant = ANT_AB,
+       .valid_rx_ant = ANT_ABC,
        .eeprom_ver = EEPROM_4965_EEPROM_VERSION,
        .eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,
        .ops = &iwl4965_ops,