2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Don Fry <[email protected]> commit 3dd823e6b86407aed1a025041d8f1df77e43a9c8 upstream. With commit 554d1d027b19265c4aa3f718b3126d2b86e09a08 only one RF_KILL interrupt will be seen by the driver when the interface is down. Re-enable the interrupt when it occurs to see all transitions. Signed-off-by: Don Fry <[email protected]> Signed-off-by: Wey-Yi Guy <[email protected]> Signed-off-by: John W. Linville <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ++++++ 1 file changed, 6 insertions(+) Index: linux-2.6.35.y/drivers/net/wireless/iwlwifi/iwl-agn.c =================================================================== --- linux-2.6.35.y.orig/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-03-29 23:02:58.917327873 -0700 +++ linux-2.6.35.y/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-03-29 23:02:59.268318892 -0700 @@ -1205,6 +1205,9 @@ /* 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)) { @@ -1420,6 +1423,9 @@ /* 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); } /* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */ _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
