From: David S. Miller Date: Tue, 8 Feb 2011 20:03:54 +0000 (-0800) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... X-Git-Tag: v2.6.38-rc5~50^2~15 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6 --- e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c index 36335b1b54d4,a236b8b14da1..c1cfd9952e52 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@@ -1154,9 -1154,12 +1154,12 @@@ static void iwl_irq_tasklet_legacy(stru } /* Re-enable all interrupts */ - /* only Re-enable if diabled by irq */ + /* only Re-enable if disabled 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)) { @@@ -1368,9 -1371,12 +1371,12 @@@ static void iwl_irq_tasklet(struct iwl_ } /* Re-enable all interrupts */ - /* only Re-enable if diabled by irq */ + /* only Re-enable if disabled 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); } /* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */