iwlwifi: clean up HW RF-kill state machine and restarts

This patch cleans up HW RF-kill state machine.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 17 insertions, 10 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 08a42a70962..eee220cf52a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1407,7 +1407,14 @@ int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv)
         spin_lock_irqsave(&priv->lock, flags);
         iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, CSR_UCODE_SW_BIT_RFKILL);
 
-        clear_bit(STATUS_RF_KILL_SW, &priv->status);
+        /* If the driver is up it will receive CARD_STATE_NOTIFICATION
+         * notification where it will clear SW rfkill status.
+         * Setting it here would break the handler. Only if the
+         * interface is down we can set here since we don't
+         * receive any further notification.
+         */
+        if (!priv->is_open)
+                clear_bit(STATUS_RF_KILL_SW, &priv->status);
         spin_unlock_irqrestore(&priv->lock, flags);
 
         /* wake up ucode */
@@ -1425,8 +1432,10 @@ int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv)
                 return 0;
         }
 
-        if (priv->is_open)
-                queue_work(priv->workqueue, &priv->restart);
+        /* If the driver is already loaded, it will receive
+         * CARD_STATE_NOTIFICATION notifications and the handler will
+         * call restart to reload the driver.
+         */
         return 1;
 }
 EXPORT_SYMBOL(iwl_radio_kill_sw_enable_radio);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index e9b6f3099d8..a4aebe19600 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -1606,14 +1606,12 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv)
                 IWL_DEBUG(IWL_DL_RF_KILL, "RF_KILL bit toggled to %s.\n",
                                 hw_rf_kill ? "disable radio":"enable radio");
 
-                /* Queue restart only if RF_KILL switch was set to "kill"
-                 *   when we loaded driver, and is now set to "enable".
-                 * After we're Alive, RF_KILL gets handled by
-                 *   iwl4965_rx_card_state_notif() */
-                if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
+                /* driver only loads ucode once setting the interface up.
+                 * the driver as well won't allow loading if RFKILL is set
+                 * therefore no need to restart the driver from this handler
+                 */
+                if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))
                         clear_bit(STATUS_RF_KILL_HW, &priv->status);
-                        queue_work(priv->workqueue, &priv->restart);
-                }
 
                 handled |= CSR_INT_BIT_RF_KILL;
         }