iwlwifi: fix resume while txpower off

This patch take care of coming out rfkill when the driver is up while
rfkill is on by restarting interface.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 06e268245077..cc4b6eba8a11 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1402,8 +1402,11 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
                  * 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))
+                if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
                         clear_bit(STATUS_RF_KILL_HW, &priv->status);
+                        if (priv->is_open && !iwl_is_rfkill(priv))
+                                queue_work(priv->workqueue, &priv->up);
+                }
 
                 handled |= CSR_INT_BIT_RF_KILL;
         }