diff options
| -rw-r--r-- | net/mac80211/pm.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index ca405b6b686d..bd185f38def1 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c | |||
| @@ -61,7 +61,24 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) | |||
| 61 | 61 | ||
| 62 | local->wowlan = wowlan && local->open_count; | 62 | local->wowlan = wowlan && local->open_count; |
| 63 | if (local->wowlan) { | 63 | if (local->wowlan) { |
| 64 | int err = drv_suspend(local, wowlan); | 64 | int err; |
| 65 | |||
| 66 | /* Drivers don't expect to suspend while some operations like | ||
| 67 | * authenticating or associating are in progress. It doesn't | ||
| 68 | * make sense anyway to accept that, since the authentication | ||
| 69 | * or association would never finish since the driver can't do | ||
| 70 | * that on its own. | ||
| 71 | * Thus, clean up in-progress auth/assoc first. | ||
| 72 | */ | ||
| 73 | list_for_each_entry(sdata, &local->interfaces, list) { | ||
| 74 | if (!ieee80211_sdata_running(sdata)) | ||
| 75 | continue; | ||
| 76 | if (sdata->vif.type != NL80211_IFTYPE_STATION) | ||
| 77 | continue; | ||
| 78 | ieee80211_mgd_quiesce(sdata); | ||
| 79 | } | ||
| 80 | |||
| 81 | err = drv_suspend(local, wowlan); | ||
| 65 | if (err < 0) { | 82 | if (err < 0) { |
| 66 | local->quiescing = false; | 83 | local->quiescing = false; |
| 67 | local->wowlan = false; | 84 | local->wowlan = false; |