diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-03-01 09:10:08 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-03-04 10:34:09 +0100 |
| commit | 23e370989c3fe6b9b2062d9d511feda800434de3 (patch) | |
| tree | cb58fdb7dcf6ec7df71454233447446d322ee24c | |
| parent | 8bb6f4b9c50eef838931e0e667f1a451f34a76ae (diff) | |
| download | op-kernel-dev-23e370989c3fe6b9b2062d9d511feda800434de3.zip op-kernel-dev-23e370989c3fe6b9b2062d9d511feda800434de3.tar.gz | |
mac80211: start queues if driver rejected wowlan
If the driver rejects WoWLAN, restart the queues before returning
to cfg80211. cfg80211 will return to mac80211, but not before it
disconnects all interfaces. If we don't start the queues, any of
the packets needed for disconnecting won't be transmitted, which
is strange. Fix that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/pm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 46ffe3a..ac6ad62 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -97,6 +97,13 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) return err; } else if (err > 0) { WARN_ON(err != 1); + /* cfg80211 will call back into mac80211 to disconnect + * all interfaces, allow that to proceed properly + */ + ieee80211_wake_queues_by_reason(hw, + IEEE80211_MAX_QUEUE_MAP, + IEEE80211_QUEUE_STOP_REASON_SUSPEND, + false); return err; } else { goto suspend; |
