Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-1000.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 0e027f7..27c5007 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -49,7 +49,7 @@
 #include "iwl-agn-debugfs.h"
 
 /* Highest firmware API version supported */
-#define IWL1000_UCODE_API_MAX 3
+#define IWL1000_UCODE_API_MAX 5
 #define IWL100_UCODE_API_MAX 5
 
 /* Lowest firmware API version supported */
@@ -147,7 +147,11 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
        priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;
 
        priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
-       priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
+       if (priv->cfg->rx_with_siso_diversity)
+               priv->hw_params.rx_chains_num = 1;
+       else
+               priv->hw_params.rx_chains_num =
+                       num_of_ant(priv->cfg->valid_rx_ant);
        priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
        priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
 
@@ -211,14 +215,16 @@ static struct iwl_lib_ops iwl1000_lib = {
                .calib_version  = iwlagn_eeprom_calib_version,
                .query_addr = iwlagn_eeprom_query_addr,
        },
-       .post_associate = iwl_post_associate,
-       .isr = iwl_isr_ict,
-       .config_ap = iwl_config_ap,
+       .isr_ops = {
+               .isr = iwl_isr_ict,
+               .free = iwl_free_isr_ict,
+               .alloc = iwl_alloc_isr_ict,
+               .reset = iwl_reset_ict,
+               .disable = iwl_disable_ict,
+       },
        .temp_ops = {
                .temperature = iwlagn_temperature,
         },
-       .manage_ibss_station = iwlagn_manage_ibss_station,
-       .update_bcast_stations = iwl_update_bcast_stations,
        .debugfs_ops = {
                .rx_stats_read = iwl_ucode_rx_stats_read,
                .tx_stats_read = iwl_ucode_tx_stats_read,
@@ -226,9 +232,6 @@ static struct iwl_lib_ops iwl1000_lib = {
                .bt_stats_read = iwl_ucode_bt_stats_read,
                .reply_tx_error = iwl_reply_tx_error_read,
        },
-       .recover_from_tx_stall = iwl_bg_monitor_recover,
-       .check_plcp_health = iwl_good_plcp_health,
-       .check_ack_health = iwl_good_ack_health,
        .txfifo_flush = iwlagn_txfifo_flush,
        .dev_txfifo_flush = iwlagn_dev_txfifo_flush,
        .tt_ops = {
@@ -243,6 +246,7 @@ static const struct iwl_ops iwl1000_ops = {
        .hcmd = &iwlagn_hcmd,
        .utils = &iwlagn_hcmd_utils,
        .led = &iwlagn_led_ops,
+       .ieee80211_ops = &iwlagn_hw_ops,
 };
 
 static struct iwl_base_params iwl1000_base_params = {
@@ -259,7 +263,7 @@ static struct iwl_base_params iwl1000_base_params = {
        .support_ct_kill_exit = true,
        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
        .chain_noise_scale = 1000,
-       .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
+       .wd_timeout = IWL_DEF_WD_TIMEOUT,
        .max_event_log_size = 128,
        .ucode_tracing = true,
        .sensitivity_calib_by_driver = true,
@@ -270,68 +274,49 @@ static struct iwl_ht_params iwl1000_ht_params = {
        .use_rts_for_aggregation = true, /* use rts/cts protection */
 };
 
+#define IWL_DEVICE_1000                                                \
+       .fw_name_pre = IWL1000_FW_PRE,                          \
+       .ucode_api_max = IWL1000_UCODE_API_MAX,                 \
+       .ucode_api_min = IWL1000_UCODE_API_MIN,                 \
+       .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
+       .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
+       .ops = &iwl1000_ops,                                    \
+       .mod_params = &iwlagn_mod_params,                       \
+       .base_params = &iwl1000_base_params,                    \
+       .led_mode = IWL_LED_BLINK
+
 struct iwl_cfg iwl1000_bgn_cfg = {
        .name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
-       .fw_name_pre = IWL1000_FW_PRE,
-       .ucode_api_max = IWL1000_UCODE_API_MAX,
-       .ucode_api_min = IWL1000_UCODE_API_MIN,
-       .sku = IWL_SKU_G|IWL_SKU_N,
-       .valid_tx_ant = ANT_A,
-       .valid_rx_ant = ANT_AB,
-       .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-       .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-       .ops = &iwl1000_ops,
-       .mod_params = &iwlagn_mod_params,
-       .base_params = &iwl1000_base_params,
+       IWL_DEVICE_1000,
        .ht_params = &iwl1000_ht_params,
 };
 
 struct iwl_cfg iwl1000_bg_cfg = {
        .name = "Intel(R) Centrino(R) Wireless-N 1000 BG",
-       .fw_name_pre = IWL1000_FW_PRE,
-       .ucode_api_max = IWL1000_UCODE_API_MAX,
-       .ucode_api_min = IWL1000_UCODE_API_MIN,
-       .sku = IWL_SKU_G,
-       .valid_tx_ant = ANT_A,
-       .valid_rx_ant = ANT_AB,
-       .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-       .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-       .ops = &iwl1000_ops,
-       .mod_params = &iwlagn_mod_params,
-       .base_params = &iwl1000_base_params,
+       IWL_DEVICE_1000,
 };
 
+#define IWL_DEVICE_100                                         \
+       .fw_name_pre = IWL100_FW_PRE,                           \
+       .ucode_api_max = IWL100_UCODE_API_MAX,                  \
+       .ucode_api_min = IWL100_UCODE_API_MIN,                  \
+       .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
+       .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
+       .ops = &iwl1000_ops,                                    \
+       .mod_params = &iwlagn_mod_params,                       \
+       .base_params = &iwl1000_base_params,                    \
+       .led_mode = IWL_LED_RF_STATE,                           \
+       .rx_with_siso_diversity = true
+
 struct iwl_cfg iwl100_bgn_cfg = {
-       .name = "Intel(R) 100 Series 1x1 BGN",
-       .fw_name_pre = IWL100_FW_PRE,
-       .ucode_api_max = IWL100_UCODE_API_MAX,
-       .ucode_api_min = IWL100_UCODE_API_MIN,
-       .sku = IWL_SKU_G|IWL_SKU_N,
-       .valid_tx_ant = ANT_A,
-       .valid_rx_ant = ANT_A,
-       .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-       .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-       .ops = &iwl1000_ops,
-       .mod_params = &iwlagn_mod_params,
-       .base_params = &iwl1000_base_params,
+       .name = "Intel(R) Centrino(R) Wireless-N 100 BGN",
+       IWL_DEVICE_100,
        .ht_params = &iwl1000_ht_params,
-       .use_new_eeprom_reading = true,
 };
 
 struct iwl_cfg iwl100_bg_cfg = {
-       .name = "Intel(R) 100 Series 1x1 BG",
-       .fw_name_pre = IWL100_FW_PRE,
-       .ucode_api_max = IWL100_UCODE_API_MAX,
-       .ucode_api_min = IWL100_UCODE_API_MIN,
-       .sku = IWL_SKU_G,
-       .valid_tx_ant = ANT_A,
-       .valid_rx_ant = ANT_A,
-       .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-       .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-       .ops = &iwl1000_ops,
-       .mod_params = &iwlagn_mod_params,
-       .base_params = &iwl1000_base_params,
-       .use_new_eeprom_reading = true,
+       .name = "Intel(R) Centrino(R) Wireless-N 100 BG",
+       IWL_DEVICE_100,
 };
 
 MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));