lkml.org 
[lkml]   [2008]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: Suspend to RAM regression in 2.6.28-rc2 (bisected)
    On Mon 27.Oct'08 at 19:16:37 +0100, Rafael J. Wysocki wrote:
    > On Monday, 27 of October 2008, Carlos R. Mafra wrote:
    > > On Mon 27.Oct'08 at 18:39:38 +0100, Rafael J. Wysocki wrote:
    > > > On Monday, 27 of October 2008, Carlos R. Mafra wrote:
    > > > > Hi,
    > > > >
    > > > > So I managed to bisect my suspend to RAM regression in 2.6.27-rc2
    > > > > to commit 3b7ee69d0caefbdb85a606a98bff841b8c63b97e ("mac80211: disassociate
    > > > > when moving to new BSS") by Tomas Winkler (Cc:-ed).
    > > > >
    > > > > Unfortunately it doesn't revert cleanly so I can't double check it.
    > > >
    > > > Why are you saying it doesn't revert cleanly? For me it does revert without
    > > > rejects from 2.6.28-rc2.
    > >
    > > I get this
    > >
    > > [mafra@localhost:linux-2.6]$ git checkout v2.6.28-rc2 -b s2ram
    > > Switched to a new branch "s2ram"
    > > [mafra@localhost:linux-2.6]$ git revert 3b7ee69d
    > > warning: too many files, skipping inexact rename detection
    > > Auto-merged net/mac80211/mlme.c
    > > CONFLICT (content): Merge conflict in net/mac80211/mlme.c
    > > Automatic revert failed. After resolving the conflicts,
    > > mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.
    > >
    > > I don't know what is happening here :-(
    >
    > If you have quilt installed, you can do:
    >
    > $ git show 3b7ee69d > suspicious.patch
    > $ quilt import -R suspicious.patch
    > $ quilt push
    >
    > (that should work without rejects) and build the kernel.

    I wanted to do it with git, but gave up after some time :-(

    So I finally read the commit in
    question 3b7ee69d0caefbdb85a606a98bff841b8c63b97e and applied
    the patch below, which reverts it up to the whitespace fixes.

    And reverting it really made my brand new 2.6.28-rc2-something
    work again, regarding suspend to RAM.

    So consider it confirmed that this commit is guilty here.

    ---
    net/mac80211/mlme.c | 4 ----
    1 files changed, 0 insertions(+), 4 deletions(-)

    diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
    index 87665d7..1751ebb 100644
    --- a/net/mac80211/mlme.c
    +++ b/net/mac80211/mlme.c
    @@ -2396,10 +2396,6 @@ void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata,
    (ifsta->flags & (IEEE80211_STA_SSID_SET |
    IEEE80211_STA_AUTO_SSID_SEL))) {

    - if (ifsta->state == IEEE80211_STA_MLME_ASSOCIATED)
    - ieee80211_set_disassoc(sdata, ifsta, true, true,
    - WLAN_REASON_DEAUTH_LEAVING);
    -
    set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
    queue_work(local->hw.workqueue, &ifsta->work);
    }
    --
    1.6.0.rc2



    \
     
     \ /
      Last update: 2008-10-27 19:39    [W:0.024 / U:1.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site