Comment 76 for bug 193970

Revision history for this message
Huaxu (huaxu-wan) wrote :

There is a patch fix this bug in Intrepid about iwl4965.

---
This patch take care of coming out rfkill when the driver is up while
rfkill is on
Signed-off-by: mohamed abbas <email address hidden>
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 7183ac5..da5d18a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1655,8 +1655,11 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv)
    * the driver as well won't allow loading if RFKILL is set
    * therefore no need to restart the driver from this handler
    */
- if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status))
+ if (!hw_rf_kill && !test_bit(STATUS_ALIVE, &priv->status)) {
    clear_bit(STATUS_RF_KILL_HW, &priv->status);
+ if (priv->is_open && !iwl_is_rfkill(priv))
+ queue_work(priv->workqueue, &priv->up);
+ }

   handled |= CSR_INT_BIT_RF_KILL;
  }
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 8eb0203..8de684d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1490,6 +1490,16 @@ int iwl_radio_kill_sw_enable_radio(struct iwl_priv *priv)
   return 0;
  }

+ /* when driver is up while rfkill is on, it wont receive
+ * any CARD_STATE_NOTIFICATION notifications so we have to
+ * restart it in here
+ */
+ if (priv->is_open && !test_bit(STATUS_ALIVE, &priv->status)) {
+ clear_bit(STATUS_RF_KILL_SW, &priv->status);
+ if (!iwl_is_rfkill(priv))
+ queue_work(priv->workqueue, &priv->up);
+ }
+
  /* If the driver is already loaded, it will receive
   * CARD_STATE_NOTIFICATION notifications and the handler will
   * call restart to reload the driver.