iwlwifi: move agn common code to iwlagn library file

[safe/jmp/linux-2.6] / 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 9d21160..a99945b 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -170,9 +170,9 @@ static struct iwl_lib_ops iwl1000_lib = {
        .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
        .txq_free_tfd = iwl_hw_txq_free_tfd,
        .txq_init = iwl_hw_tx_queue_init,
-       .rx_handler_setup = iwl5000_rx_handler_setup,
-       .setup_deferred_work = iwl5000_setup_deferred_work,
-       .is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
+       .rx_handler_setup = iwlagn_rx_handler_setup,
+       .setup_deferred_work = iwlagn_setup_deferred_work,
+       .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
        .load_ucode = iwlagn_load_ucode,
        .dump_nic_event_log = iwl_dump_nic_event_log,
        .dump_nic_error_log = iwl_dump_nic_error_log,
@@ -180,7 +180,7 @@ static struct iwl_lib_ops iwl1000_lib = {
        .dump_fh = iwl_dump_fh,
        .init_alive_start = iwlagn_init_alive_start,
        .alive_notify = iwlagn_alive_notify,
-       .send_tx_power = iwl5000_send_tx_power,
+       .send_tx_power = iwlagn_send_tx_power,
        .update_chain_flags = iwl_update_chain_flags,
        .apm_ops = {
                .init = iwl_apm_init,
@@ -190,25 +190,25 @@ static struct iwl_lib_ops iwl1000_lib = {
        },
        .eeprom_ops = {
                .regulatory_bands = {
-                       EEPROM_5000_REG_BAND_1_CHANNELS,
-                       EEPROM_5000_REG_BAND_2_CHANNELS,
-                       EEPROM_5000_REG_BAND_3_CHANNELS,
-                       EEPROM_5000_REG_BAND_4_CHANNELS,
-                       EEPROM_5000_REG_BAND_5_CHANNELS,
-                       EEPROM_5000_REG_BAND_24_HT40_CHANNELS,
-                       EEPROM_5000_REG_BAND_52_HT40_CHANNELS
+                       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_REG_BAND_24_HT40_CHANNELS,
+                       EEPROM_REG_BAND_52_HT40_CHANNELS
                },
                .verify_signature  = iwlcore_eeprom_verify_signature,
                .acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
                .release_semaphore = iwlcore_eeprom_release_semaphore,
-               .calib_version  = iwl5000_eeprom_calib_version,
-               .query_addr = iwl5000_eeprom_query_addr,
+               .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,
        .temp_ops = {
-               .temperature = iwl5000_temperature,
+               .temperature = iwlagn_temperature,
                .set_ct_kill = iwl1000_set_ct_threshold,
         },
        .add_bcast_station = iwl_add_bcast_station,