[PATCH wireless-2.6.38] iwlagn: Re-enable RF_KILL interrupt when down

[PATCH wireless-2.6.38] iwlagn: Re-enable RF_KILL interrupt when down

[Wey-Yi Guy]

From: Don Fry <donald.h.fry@intel.com>

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 <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
this patch is also available from wireless-2.6 branch on
 git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
---
 drivers/net/wireless/iwlwifi/iwl-agn.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index f13a83a..a236b8b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1157,6 +1157,9 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
 	/* 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)) {
@@ -1371,6 +1374,9 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
 	/* 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 */
-- 
1.7.0.4

Re: [PATCH wireless-2.6.38] iwlagn: Re-enable RF_KILL interrupt when down

[Stanislaw Gruszka]

On Sun, Feb 06, 2011 at 09:29:45AM -0800, Wey-Yi Guy wrote:
> From: Don Fry <donald.h.fry@intel.com>
> 
> 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.

What practical problem this fix? I'm asking, because my RF_KILL commit
went to stable, shouldn't this fix go to stable as well?

Stanislaw

RE: [PATCH wireless-2.6.38] iwlagn: Re-enable RF_KILL interrupt when down

[Guy, Wey-Yi W]

On Sun, Feb 06, 2011 at 09:29:45AM -0800, Wey-Yi Guy wrote:
> From: Don Fry <donald.h.fry@intel.com>
> 
> 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.

What practical problem this fix? I'm asking, because my RF_KILL commit
went to stable, shouldn't this fix go to stable as well?

We seeing problem when we perform the following step:

1. Load the driver
2. Switch HW RF kill ON
3. Switch HW RF Kill OFF
4. Check the status with "rfkill list"

Repeat few time, the "Hard blocked" will stay "yes", at this point, the only way to fix is to unload the driver.

You are right, this patch should back port to stable since the commit 554d1d027b19265c4aa3f718b3126d2b86e09a08 backport to stable.

Wey