---

yaml
---
r: 122687
b: refs/heads/master
c: edb3422
h: refs/heads/master
i:
  122685: 1c4f34b
  122683: 7cf4664
  122679: a936a6c
  122671: 8832a9d
  122655: f76f47c
  122623: 79e62ae
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d5717ade01ce22511f2992f150bf6644b21c377
+refs/heads/master: edb342286e18c5bec6d3ac325851a9cba28061b9

trunk/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;
 	}

trunk/drivers/net/wireless/iwlwifi/iwl-core.c

@@ -1446,6 +1446,16 @@ int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv)
 		return 0;
 	}
 
+	/* when driver is up while rfkill is on, it wont receive
+	 * any CARD_STATE_NOTIFICATION notifications so we have to
+	 * restart it in here
+	 */
+	if (priv->is_open && !test_bit(STATUS_ALIVE, &priv->status)) {
+		clear_bit(STATUS_RF_KILL_SW, &priv->status);
+		if (!iwl_is_rfkill(priv))
+			queue_work(priv->workqueue, &priv->up);
+	}
+
 	/* If the driver is already loaded, it will receive
 	 * CARD_STATE_NOTIFICATION notifications and the handler will
 	 * call restart to reload the driver.