diff options
| author |   Pontus Fuchs <pontus.fuchs@gmail.com> | 2012-05-31 12:34:47 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-06-06 15:20:22 -0400 |
| commit | 3b08cf6bd2763bfe9d04fad4d7de29ee7735cd76 (patch) | |
| tree | 9a660a495c4fa119417be06d61677e1df05b7f02 /net/mac80211/pm.c | |
| parent | mac80211: Add missing mesh parameter dot11MeshForwarding for debugfs (diff) | |
| download | linux-dev-3b08cf6bd2763bfe9d04fad4d7de29ee7735cd76.tar.xz linux-dev-3b08cf6bd2763bfe9d04fad4d7de29ee7735cd76.zip | |
mac80211: Clear wowlan flag when drv_suspend returns failure
drv_resume can get called without a prior call to drv_suspend.
Consider the following steps:
1. Suspend is started but driver's drv_suspend returns error.
2. Suspend is aborted. local->wowlan flag is left set.
3. Interface is removed.
4. Suspend again. This time open_count is 0 so drv_suspend is
not called and local->wowlan not cleared.
5. On resume ieee80211_reconfig will call drv_resume since
local->wowlan is set.
Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/pm.c')
| -rw-r--r-- | net/mac80211/pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index af1c4e26e965..98c128be3827 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -77,6 +77,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) int err = drv_suspend(local, wowlan); if (err < 0) { local->quiescing = false; + local->wowlan = false; return err; } else if (err > 0) { WARN_ON(err != 1); |