---

yaml
---
r: 203299
b: refs/heads/master
c: 0ab84cf
h: refs/heads/master
i:
  203297: d0999f6
  203295: c6ad54e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 278c2f6faafebe28b9776918ce5fbaef9795c141
+refs/heads/master: 0ab84cff8befbea342576cd6dc21026d5c9244df

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

@@ -2845,6 +2845,7 @@ int iwl_pci_resume(struct pci_dev *pdev)
 {
 	struct iwl_priv *priv = pci_get_drvdata(pdev);
 	int ret;
+	bool hw_rfkill = false;
 
 	/*
 	 * We disable the RETRY_TIMEOUT register (0x41) to keep
@@ -2859,6 +2860,17 @@ int iwl_pci_resume(struct pci_dev *pdev)
 	pci_restore_state(pdev);
 	iwl_enable_interrupts(priv);
 
+	if (!(iwl_read32(priv, CSR_GP_CNTRL) &
+				CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
+		hw_rfkill = true;
+
+	if (hw_rfkill)
+		set_bit(STATUS_RF_KILL_HW, &priv->status);
+	else
+		clear_bit(STATUS_RF_KILL_HW, &priv->status);
+
+	wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rfkill);
+
 	return 0;
 }
 EXPORT_SYMBOL(iwl_pci_resume);