linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 09/16] mac80211: start queues if driver rejected wowlan
Date: Sun,  1 Mar 2015 09:10:08 +0200	[thread overview]
Message-ID: <1425193815-17785-10-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1425193815-17785-1-git-send-email-emmanuel.grumbach@intel.com>

From: Johannes Berg <johannes.berg@intel.com>

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>
---
 net/mac80211/pm.c | 7 +++++++
 1 file changed, 7 insertions(+)

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;
-- 
1.9.1


  parent reply	other threads:[~2015-03-01  7:10 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-01  7:09 [PATCH 00/16] Various patches from our internal tree Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 01/16] mac80211: Update beacon's timing and DTIM count on every beacon Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 02/16] cfg80211: add operating classes 128-130 Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 03/16] mac80211: TDLS: support VHT between peers Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 04/16] mac80211: fix another suspend vs. association race Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 05/16] mac80211: handle drv_add_interface failures properly during reconfig Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 06/16] mac80211: tell drivers the user TX power restriction Emmanuel Grumbach
2015-03-04  9:34   ` Johannes Berg
2015-03-01  7:10 ` [PATCH 07/16] mac80211: don't do driver suspend with auth/assoc in progress Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 08/16] mac80211: remove useless double check for open_count in __ieee80211_suspend() Emmanuel Grumbach
2015-03-01  7:10 ` Emmanuel Grumbach [this message]
2015-03-01  7:10 ` [PATCH 10/16] mac80211: allow TDLS setup code to take wdev lock Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 11/16] mac80211: remove duplicate check for quiescing when queueing work Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 12/16] mac80211: update TDLS sta spatial streams before auth Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 13/16] mac80211: check and dequeue skb in ieee80211_tx_prepare_skb() Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 14/16] nl80211: prohibit mixing 'any' and regular wowlan triggers Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 15/16] mac80211: remove channel_switch_beacon operation Emmanuel Grumbach
2015-03-01  7:10 ` [PATCH 16/16] mac80211: allow iterating inactive interfaces Emmanuel Grumbach
2015-03-03  9:47 ` [PATCH 00/16] Various patches from our internal tree Johannes Berg
2015-03-03 10:01   ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1425193815-17785-10-git-send-email-emmanuel.grumbach@intel.com \
    --to=emmanuel.grumbach@intel.com \
    --cc=johannes.berg@intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).