1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index db540910b11..3100a72b9b4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -211,14 +211,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,
@@ -243,6 +245,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 = {
@@ -275,7 +278,6 @@ struct iwl_cfg iwl1000_bgn_cfg = {
         .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,
@@ -284,6 +286,7 @@ struct iwl_cfg iwl1000_bgn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
         .ht_params = &iwl1000_ht_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl1000_bg_cfg = {
@@ -291,7 +294,6 @@ struct iwl_cfg iwl1000_bg_cfg = {
         .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,
@@ -299,6 +301,7 @@ struct iwl_cfg iwl1000_bg_cfg = {
         .ops = &iwl1000_ops,
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl100_bgn_cfg = {
@@ -306,7 +309,6 @@ struct iwl_cfg iwl100_bgn_cfg = {
         .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,
@@ -315,6 +317,7 @@ struct iwl_cfg iwl100_bgn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
         .ht_params = &iwl1000_ht_params,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 struct iwl_cfg iwl100_bg_cfg = {
@@ -322,7 +325,6 @@ struct iwl_cfg iwl100_bg_cfg = {
         .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,
@@ -330,6 +332,7 @@ struct iwl_cfg iwl100_bg_cfg = {
         .ops = &iwl1000_ops,
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));