On Sun, 2008-11-09 at 08:51 +0800, Tomas Winkler wrote: > This patch fixes suspend to RAM after by moving > notify_mac out of iwlwifi mutex > > http://bugzilla.kernel.org/show_bug.cgi?id=11845 Greg, please also merge the iwl3945 counterpart for this problem. http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d54bc4e3fc5c56600a13c9ebc0a7e1077ac05d59 Thanks, -yi > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> > Tested-by: Carlos R. Mafra <crmafra2@xxxxxxxxx> > Tested-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > Cc: Rafael J. Wysocki <rjw@xxxxxxx> > Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> > --- > drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c > index e01f048..edab202 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-agn.c > +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c > @@ -2090,7 +2090,6 @@ static void iwl_alive_start(struct iwl_priv *priv) > iwl4965_error_recovery(priv); > > iwl_power_update_mode(priv, 1); > - ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); > > if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status)) > iwl4965_set_mode(priv, priv->iw_mode); > @@ -2342,6 +2341,7 @@ static void iwl_bg_alive_start(struct work_struct *data) > mutex_lock(&priv->mutex); > iwl_alive_start(priv); > mutex_unlock(&priv->mutex); > + ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC); > } > > static void iwl4965_bg_rf_kill(struct work_struct *work) -- 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
