--- drivers/net/wireless/iwlwifi/iwl-agn.c

+++ drivers/net/wireless/iwlwifi/iwl-agn.c

@@ -1044,6 +1044,9 @@ static void iwl_irq_tasklet_legacy(struc

/* only Re-enable if diabled by irq */

if (test_bit(STATUS_INT_ENABLED, &priv->status))

iwl_enable_interrupts(priv);

+ /* Re-enable RF_KILL if it occurred */

+ else if (handled & CSR_INT_BIT_RF_KILL)

+ iwl_enable_rfkill_int(priv);

#ifdef CONFIG_IWLWIFI_DEBUG

if (iwl_get_debug_level(priv) & (IWL_DL_ISR)) {

@@ -1245,6 +1248,9 @@ static void iwl_irq_tasklet(struct iwl_p

/* only Re-enable if diabled by irq */

if (test_bit(STATUS_INT_ENABLED, &priv->status))

iwl_enable_interrupts(priv);

+ /* Re-enable RF_KILL if it occurred */

+ else if (handled & CSR_INT_BIT_RF_KILL)

+ iwl_enable_rfkill_int(priv);

spin_unlock_irqrestore(&priv->lock, flags);

@@ -2358,9 +2364,10 @@ static void iwl_mac_stop(struct ieee8021

flush_workqueue(priv->workqueue);

- /* enable interrupts again in order to receive rfkill changes */

+ /* User space software may expect getting rfkill changes

+ * even if interface is down */

iwl_write32(priv, CSR_INT, 0xFFFFFFFF);

- iwl_enable_interrupts(priv);

+ iwl_enable_rfkill_int(priv);

IWL_DEBUG_MAC80211(priv, "leave\n");

}

@@ -3060,14 +3067,14 @@ static int iwl_pci_probe(struct pci_dev

* 8. Setup and register mac80211

**********************************/

- /* enable interrupts if needed: hw bug w/a */

+ /* enable rfkill interrupt: hw bug w/a */

pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd);

if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {

pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;

pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd);

}

- iwl_enable_interrupts(priv);

+ iwl_enable_rfkill_int(priv);

err = iwl_setup_mac(priv);

if (err)