1 files changed, 21 insertions, 38 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 0a5507cbeb3f..a5637c4aa85d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -188,7 +188,7 @@ int iwl_commit_rxon(struct iwl_priv *priv)
                 memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
         }
 
-        priv->cfg->ops->smgmt->clear_station_table(priv);
+        iwl_clear_stations_table(priv);
 
         priv->start_calib = 0;
 
@@ -737,19 +737,13 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv,
                 clear_bit(STATUS_RF_KILL_HW, &priv->status);
 
 
-        if (flags & SW_CARD_DISABLED)
-                set_bit(STATUS_RF_KILL_SW, &priv->status);
-        else
-                clear_bit(STATUS_RF_KILL_SW, &priv->status);
-
         if (!(flags & RXON_CARD_DISABLED))
                 iwl_scan_cancel(priv);
 
         if ((test_bit(STATUS_RF_KILL_HW, &status) !=
-             test_bit(STATUS_RF_KILL_HW, &priv->status)) ||
-            (test_bit(STATUS_RF_KILL_SW, &status) !=
-             test_bit(STATUS_RF_KILL_SW, &priv->status)))
-                queue_work(priv->workqueue, &priv->rf_kill);
+             test_bit(STATUS_RF_KILL_HW, &priv->status)))
+                wiphy_rfkill_set_hw_state(priv->hw->wiphy,
+                        test_bit(STATUS_RF_KILL_HW, &priv->status));
         else
                 wake_up_interruptible(&priv->wait_command_queue);
 }
@@ -1045,7 +1039,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
                                 set_bit(STATUS_RF_KILL_HW, &priv->status);
                         else
                                 clear_bit(STATUS_RF_KILL_HW, &priv->status);
-                        queue_work(priv->workqueue, &priv->rf_kill);
+                        wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rf_kill);
                 }
 
                 handled |= CSR_INT_BIT_RF_KILL;
@@ -1218,7 +1212,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
                                 set_bit(STATUS_RF_KILL_HW, &priv->status);
                         else
                                 clear_bit(STATUS_RF_KILL_HW, &priv->status);
-                        queue_work(priv->workqueue, &priv->rf_kill);
+                        wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rf_kill);
                 }
 
                 handled |= CSR_INT_BIT_RF_KILL;
@@ -1617,7 +1611,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
                 goto restart;
         }
 
-        priv->cfg->ops->smgmt->clear_station_table(priv);
+        iwl_clear_stations_table(priv);
         ret = priv->cfg->ops->lib->alive_notify(priv);
         if (ret) {
                 IWL_WARN(priv,
@@ -1703,7 +1697,7 @@ static void __iwl_down(struct iwl_priv *priv)
 
         iwl_leds_unregister(priv);
 
-        priv->cfg->ops->smgmt->clear_station_table(priv);
+        iwl_clear_stations_table(priv);
 
         /* Unblock any waiting calls */
         wake_up_interruptible_all(&priv->wait_command_queue);
@@ -1726,12 +1720,10 @@ static void __iwl_down(struct iwl_priv *priv)
                 ieee80211_stop_queues(priv->hw);
 
         /* If we have not previously called iwl_init() then
-         * clear all bits but the RF Kill bits and return */
+         * clear all bits but the RF Kill bit and return */
         if (!iwl_is_init(priv)) {
                 priv->status = test_bit(STATUS_RF_KILL_HW, &priv->status) <<
                                         STATUS_RF_KILL_HW |
-                               test_bit(STATUS_RF_KILL_SW, &priv->status) <<
-                                        STATUS_RF_KILL_SW |
                                test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
                                         STATUS_GEO_CONFIGURED |
                                test_bit(STATUS_EXIT_PENDING, &priv->status) <<
@@ -1740,11 +1732,9 @@ static void __iwl_down(struct iwl_priv *priv)
         }
 
         /* ...otherwise clear out all the status bits but the RF Kill
-         * bits and continue taking the NIC down. */
+         * bit and continue taking the NIC down. */
         priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) <<
                                 STATUS_RF_KILL_HW |
-                        test_bit(STATUS_RF_KILL_SW, &priv->status) <<
-                                STATUS_RF_KILL_SW |
                         test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
                                 STATUS_GEO_CONFIGURED |
                         test_bit(STATUS_FW_ERROR, &priv->status) <<
@@ -1866,9 +1856,10 @@ static int __iwl_up(struct iwl_priv *priv)
                 set_bit(STATUS_RF_KILL_HW, &priv->status);
 
         if (iwl_is_rfkill(priv)) {
+                wiphy_rfkill_set_hw_state(priv->hw->wiphy, true);
+
                 iwl_enable_interrupts(priv);
-                IWL_WARN(priv, "Radio disabled by %s RF Kill switch\n",
-                    test_bit(STATUS_RF_KILL_HW, &priv->status) ? "HW" : "SW");
+                IWL_WARN(priv, "Radio disabled by HW RF Kill switch\n");
                 return 0;
         }
 
@@ -1887,8 +1878,6 @@ static int __iwl_up(struct iwl_priv *priv)
 
         /* clear (again), then enable host interrupts */
         iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
-        /* enable dram interrupt */
-        iwl_reset_ict(priv);
         iwl_enable_interrupts(priv);
 
         /* really make sure rfkill handshake bits are cleared */
@@ -1903,7 +1892,7 @@ static int __iwl_up(struct iwl_priv *priv)
 
         for (i = 0; i < MAX_HW_RESTARTS; i++) {
 
-                priv->cfg->ops->smgmt->clear_station_table(priv);
+                iwl_clear_stations_table(priv);
 
                 /* load bootstrap state machine,
                  * load bootstrap program into processor's memory,
@@ -1962,6 +1951,9 @@ static void iwl_bg_alive_start(struct work_struct *data)
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
 
+        /* enable dram interrupt */
+        iwl_reset_ict(priv);
+
         mutex_lock(&priv->mutex);
         iwl_alive_start(priv);
         mutex_unlock(&priv->mutex);
@@ -2000,7 +1992,6 @@ static void iwl_bg_up(struct work_struct *data)
         mutex_lock(&priv->mutex);
         __iwl_up(priv);
         mutex_unlock(&priv->mutex);
-        iwl_rfkill_set_hw_state(priv);
 }
 
 static void iwl_bg_restart(struct work_struct *data)
@@ -2178,8 +2169,6 @@ static int iwl_mac_start(struct ieee80211_hw *hw)
 
         mutex_unlock(&priv->mutex);
 
-        iwl_rfkill_set_hw_state(priv);
-
         if (ret)
                 return ret;
 
@@ -2348,7 +2337,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 return -EOPNOTSUPP;
         }
         addr = sta ? sta->addr : iwl_bcast_addr;
-        sta_id = priv->cfg->ops->smgmt->find_station(priv, addr);
+        sta_id = iwl_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
                 IWL_DEBUG_MAC80211(priv, "leave - %pM not in station map.\n",
                                    addr);
@@ -2774,7 +2763,6 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
         INIT_WORK(&priv->up, iwl_bg_up);
         INIT_WORK(&priv->restart, iwl_bg_restart);
         INIT_WORK(&priv->rx_replenish, iwl_bg_rx_replenish);
-        INIT_WORK(&priv->rf_kill, iwl_bg_rf_kill);
         INIT_WORK(&priv->beacon_update, iwl_bg_beacon_update);
         INIT_WORK(&priv->run_time_calib_work, iwl_bg_run_time_calib_work);
         INIT_DELAYED_WORK(&priv->init_alive_start, iwl_bg_init_alive_start);
@@ -3045,12 +3033,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         else
                 set_bit(STATUS_RF_KILL_HW, &priv->status);
 
-        err = iwl_rfkill_init(priv);
-        if (err)
-                IWL_ERR(priv, "Unable to initialize RFKILL system. "
-                                  "Ignoring error: %d\n", err);
-        else
-                iwl_rfkill_set_hw_state(priv);
+        wiphy_rfkill_set_hw_state(priv->hw->wiphy,
+                test_bit(STATUS_RF_KILL_HW, &priv->status));
 
         iwl_power_initialize(priv);
         return 0;
@@ -3114,14 +3098,13 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 
         iwl_synchronize_irq(priv);
 
-        iwl_rfkill_unregister(priv);
         iwl_dealloc_ucode_pci(priv);
 
         if (priv->rxq.bd)
                 iwl_rx_queue_free(priv, &priv->rxq);
         iwl_hw_txq_ctx_free(priv);
 
-        priv->cfg->ops->smgmt->clear_station_table(priv);
+        iwl_clear_stations_table(priv);
         iwl_eeprom_free(priv);