1 files changed, 2 insertions, 217 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index f124ec697168..00da2520a4b7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -24,26 +24,11 @@
  *
  *****************************************************************************/
 
-#include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <net/mac80211.h>
-#include <linux/etherdevice.h>
-#include <asm/unaligned.h>
 #include <linux/stringify.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-core.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-agn-hw.h"
-#include "iwl-trans.h"
-#include "iwl-shared.h"
+#include "iwl-config.h"
 #include "iwl-cfg.h"
+#include "iwl-dev.h" /* still needed */
 
 /* Highest firmware API version supported */
 #define IWL6000_UCODE_API_MAX 6
@@ -71,200 +56,6 @@
 #define IWL6030_FW_PRE "iwlwifi-6000g2b-"
 #define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"
 
-static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
-{
-        /* want Celsius */
-        priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;
-        priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
-}
-
-/* NIC configuration for 6000 series */
-static void iwl6000_nic_config(struct iwl_priv *priv)
-{
-        iwl_rf_config(priv);
-
-        switch (cfg(priv)->device_family) {
-        case IWL_DEVICE_FAMILY_6005:
-        case IWL_DEVICE_FAMILY_6030:
-        case IWL_DEVICE_FAMILY_6000:
-                break;
-        case IWL_DEVICE_FAMILY_6000i:
-                /* 2x2 IPA phy type */
-                iwl_write32(trans(priv), CSR_GP_DRIVER_REG,
-                             CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);
-                break;
-        case IWL_DEVICE_FAMILY_6050:
-                /* Indicate calibration version to uCode. */
-                if (iwl_eeprom_calib_version(priv) >= 6)
-                        iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
-                                        CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
-                break;
-        case IWL_DEVICE_FAMILY_6150:
-                /* Indicate calibration version to uCode. */
-                if (iwl_eeprom_calib_version(priv) >= 6)
-                        iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
-                                        CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
-                iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
-                            CSR_GP_DRIVER_REG_BIT_6050_1x2);
-                break;
-        default:
-                WARN_ON(1);
-        }
-}
-
-static const struct iwl_sensitivity_ranges iwl6000_sensitivity = {
-        .min_nrg_cck = 110,
-        .auto_corr_min_ofdm = 80,
-        .auto_corr_min_ofdm_mrc = 128,
-        .auto_corr_min_ofdm_x1 = 105,
-        .auto_corr_min_ofdm_mrc_x1 = 192,
-
-        .auto_corr_max_ofdm = 145,
-        .auto_corr_max_ofdm_mrc = 232,
-        .auto_corr_max_ofdm_x1 = 110,
-        .auto_corr_max_ofdm_mrc_x1 = 232,
-
-        .auto_corr_min_cck = 125,
-        .auto_corr_max_cck = 175,
-        .auto_corr_min_cck_mrc = 160,
-        .auto_corr_max_cck_mrc = 310,
-        .nrg_th_cck = 110,
-        .nrg_th_ofdm = 110,
-
-        .barker_corr_th_min = 190,
-        .barker_corr_th_min_mrc = 336,
-        .nrg_th_cca = 62,
-};
-
-static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)
-{
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        if (cfg(priv)->rx_with_siso_diversity)
-                priv->hw_params.rx_chains_num = 1;
-        else
-                priv->hw_params.rx_chains_num =
-                        num_of_ant(priv->hw_params.valid_rx_ant);
-
-        iwl6000_set_ct_threshold(priv);
-
-        /* Set initial sensitivity parameters */
-        priv->hw_params.sens = &iwl6000_sensitivity;
-
-}
-
-static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
-                                     struct ieee80211_channel_switch *ch_switch)
-{
-        /*
-         * MULTI-FIXME
-         * See iwlagn_mac_channel_switch.
-         */
-        struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl6000_channel_switch_cmd cmd;
-        const struct iwl_channel_info *ch_info;
-        u32 switch_time_in_usec, ucode_switch_time;
-        u16 ch;
-        u32 tsf_low;
-        u8 switch_count;
-        u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);
-        struct ieee80211_vif *vif = ctx->vif;
-        struct iwl_host_cmd hcmd = {
-                .id = REPLY_CHANNEL_SWITCH,
-                .len = { sizeof(cmd), },
-                .flags = CMD_SYNC,
-                .data = { &cmd, },
-        };
-
-        cmd.band = priv->band == IEEE80211_BAND_2GHZ;
-        ch = ch_switch->channel->hw_value;
-        IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
-                      ctx->active.channel, ch);
-        cmd.channel = cpu_to_le16(ch);
-        cmd.rxon_flags = ctx->staging.flags;
-        cmd.rxon_filter_flags = ctx->staging.filter_flags;
-        switch_count = ch_switch->count;
-        tsf_low = ch_switch->timestamp & 0x0ffffffff;
-        /*
-         * calculate the ucode channel switch time
-         * adding TSF as one of the factor for when to switch
-         */
-        if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
-                if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
-                    beacon_interval)) {
-                        switch_count -= (priv->ucode_beacon_time -
-                                tsf_low) / beacon_interval;
-                } else
-                        switch_count = 0;
-        }
-        if (switch_count <= 1)
-                cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
-        else {
-                switch_time_in_usec =
-                        vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
-                ucode_switch_time = iwl_usecs_to_beacons(priv,
-                                                         switch_time_in_usec,
-                                                         beacon_interval);
-                cmd.switch_time = iwl_add_beacon_time(priv,
-                                                      priv->ucode_beacon_time,
-                                                      ucode_switch_time,
-                                                      beacon_interval);
-        }
-        IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
-                      cmd.switch_time);
-        ch_info = iwl_get_channel_info(priv, priv->band, ch);
-        if (ch_info)
-                cmd.expect_beacon = is_channel_radar(ch_info);
-        else {
-                IWL_ERR(priv, "invalid channel switch from %u to %u\n",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
-
-        return iwl_dvm_send_cmd(priv, &hcmd);
-}
-
-static struct iwl_lib_ops iwl6000_lib = {
-        .set_hw_params = iwl6000_hw_set_hw_params,
-        .set_channel_switch = iwl6000_hw_channel_switch,
-        .nic_config = iwl6000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-                .enhanced_txpower = true,
-        },
-        .temperature = iwlagn_temperature,
-};
-
-static struct iwl_lib_ops iwl6030_lib = {
-        .set_hw_params = iwl6000_hw_set_hw_params,
-        .set_channel_switch = iwl6000_hw_channel_switch,
-        .nic_config = iwl6000_nic_config,
-        .eeprom_ops = {
-                .regulatory_bands = {
-                        EEPROM_REG_BAND_1_CHANNELS,
-                        EEPROM_REG_BAND_2_CHANNELS,
-                        EEPROM_REG_BAND_3_CHANNELS,
-                        EEPROM_REG_BAND_4_CHANNELS,
-                        EEPROM_REG_BAND_5_CHANNELS,
-                        EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-                .enhanced_txpower = true,
-        },
-        .temperature = iwlagn_temperature,
-};
-
 static const struct iwl_base_params iwl6000_base_params = {
         .eeprom_size = OTP_LOW_IMAGE_SIZE,
         .num_of_queues = IWLAGN_NUM_QUEUES,
@@ -337,7 +128,6 @@ static const struct iwl_bt_params iwl6000_bt_params = {
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_6005_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,       \
-        .lib = &iwl6000_lib,                                    \
         .base_params = &iwl6000_g2_base_params,                 \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE
@@ -392,7 +182,6 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = {
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
-        .lib = &iwl6030_lib,                                    \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
         .need_temp_offset_calib = true,                         \
@@ -466,7 +255,6 @@ const struct iwl_cfg iwl130_bg_cfg = {
         .valid_rx_ant = ANT_BC,         /* .cfg overwrite */    \
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,       \
-        .lib = &iwl6000_lib,                                    \
         .base_params = &iwl6000_base_params,                    \
         .led_mode = IWL_LED_BLINK
 
@@ -495,7 +283,6 @@ const struct iwl_cfg iwl6000i_2bg_cfg = {
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
         .valid_tx_ant = ANT_AB,         /* .cfg overwrite */    \
         .valid_rx_ant = ANT_AB,         /* .cfg overwrite */    \
-        .lib = &iwl6000_lib,                                    \
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
@@ -520,7 +307,6 @@ const struct iwl_cfg iwl6050_2abg_cfg = {
         .device_family = IWL_DEVICE_FAMILY_6150,                \
         .max_inst_size = IWL60_RTC_INST_SIZE,                   \
         .max_data_size = IWL60_RTC_DATA_SIZE,                   \
-        .lib = &iwl6000_lib,                                    \
         .eeprom_ver = EEPROM_6150_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
@@ -549,7 +335,6 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
         .max_data_size = IWL60_RTC_DATA_SIZE,
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
-        .lib = &iwl6000_lib,
         .base_params = &iwl6000_base_params,
         .ht_params = &iwl6000_ht_params,
         .led_mode = IWL_LED_BLINK,