Hi, Am Donnerstag, 26. März 2009 schrieb Reinette Chatre: > From: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx> > > Remove STATUS_ALIVE checking when HW RF KILL disabled, the bit get > clear in __iwl_down() function; the additional checking will fail and > cause RF can not be turn back on. Are you sure this is needed? I'd argue we should only restart the adapter if it was alive when it got rf_killed. In case the adapter was rf_killed while the interface was down I don't think we want to restart the adapter immediately but first when the interface is taken up again. Helmut > Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx> > Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx> > --- > drivers/net/wireless/iwlwifi/iwl-core.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c > index e1b5472..7560d6f 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-core.c > +++ b/drivers/net/wireless/iwlwifi/iwl-core.c > @@ -2056,8 +2056,7 @@ void iwl_bg_rf_kill(struct work_struct *work) > IWL_DEBUG_RF_KILL(priv, > "HW and/or SW RF Kill no longer active, restarting " > "device\n"); > - if (!test_bit(STATUS_EXIT_PENDING, &priv->status) && > - test_bit(STATUS_ALIVE, &priv->status)) > + if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) > queue_work(priv->workqueue, &priv->restart); > } else { > /* make sure mac80211 stop sending Tx frame */ -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html