Re: Suspend to RAM regression in 2.6.28-rc2 (bisected)

Tomas Winkler
2008-10-27T22:41:16Z

On Tue, Oct 28, 2008 at 12:28 AM, Carlos R. Mafra <crmafra2@gmail.com> wrote:
> On Mon 27.Oct'08 at 23:07:00 +0200, Tomas Winkler wrote:
>>[...]
>>
>> Can someone try this one (it might be space broken I've just pasted
>> that in) It's on top of 1d63e726408dfdb3e10ed8f00c383b30ebb333d3
>> (latest linux-2.6.git)
>
>
> Yes, this one also works for me (I applied it manually).
Good, this was actually part of some older and bigger patch I wasn't
aware it has this affect. It has some millage in iwl5000 branch.
RFKIll went through some changes in the mainline so it wasn't merged yet.

commit a91ad840c23a70bc0eabe239e178e0d979a6d44e
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Mon Jun 30 17:48:26 2008 +0300
iwlwifi: bug fixes in RF-kill flows

Tomas
>
>
>> diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c
>> b/drivers/net/wireless/iwlwifi/iwl-agn.c
>> index 24a1aeb..321dbc8 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)
>>
>>
>> Thanks
>> Tomas
>