iwlwifi: generic parameter define for _agn device

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / iwl-6000.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index c909a9c5e5e1058b4acb6d82f3bac827380cfcd4..59681c5eeb9f01b16d664517191896ef97864b9f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -160,8 +160,8 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
                        priv->cfg->num_of_queues *
                        sizeof(struct iwlagn_scd_bc_tbl);
        priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
-       priv->hw_params.max_stations = IWL5000_STATION_COUNT;
-       priv->hw_params.bcast_sta_id = IWL5000_BROADCAST_ID;
+       priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
+       priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;
 
        priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;
        priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;
@@ -318,6 +318,7 @@ static struct iwl_lib_ops iwl6000_lib = {
                .set_calib_version = iwl6000_set_calib_version,
         },
        .manage_ibss_station = iwlagn_manage_ibss_station,
+       .update_bcast_station = iwl_update_bcast_station,
        .debugfs_ops = {
                .rx_stats_read = iwl_ucode_rx_stats_read,
                .tx_stats_read = iwl_ucode_tx_stats_read,
@@ -326,6 +327,8 @@ static struct iwl_lib_ops iwl6000_lib = {
        .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,
 };
 
 static const struct iwl_ops iwl6000_ops = {
@@ -422,6 +425,8 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -455,6 +460,8 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -490,6 +497,8 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -523,6 +532,8 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -558,6 +569,8 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -591,6 +604,8 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -626,6 +641,8 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };
 
@@ -659,6 +676,8 @@ struct iwl_cfg iwl6000g2b_bg_cfg = {
        .chain_noise_scale = 1000,
        .monitor_recover_period = IWL_MONITORING_PERIOD,
        .max_event_log_size = 512,
+       .sensitivity_calib_by_driver = true,
+       .chain_noise_calib_by_driver = true,
        .need_dc_calib = true,
 };