---

yaml --- r: 352665 b: refs/heads/master c: 9c35d7d h: refs/heads/master i: 352663: 88fee37 v: v3
git-mirror · Feb 11, 2013 · 8c956f6 · 8c956f6
1 parent 2979e73
commit 8c956f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c17b77b67587b9f9e3070fb89fe98cef3187131
+refs/heads/master: 9c35d7d2368f54313b988a01c408e5cf863ffd9e
diff --git a/trunk/net/mac80211/offchannel.c b/trunk/net/mac80211/offchannel.c
@@ -114,8 +114,13 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local)
 	 * STA interfaces.
 	 */
 
+	/*
+	 * Stop queues and transmit all frames queued by the driver
+	 * before sending nullfunc to enable powersave at the AP.
+	 */
 	ieee80211_stop_queues_by_reason(&local->hw,
 					IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL);
+	drv_flush(local, false);
 
 	mutex_lock(&local->iflist_mtx);
 	list_for_each_entry(sdata, &local->interfaces, list) {

diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
@@ -334,6 +334,9 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
 
 	ieee80211_offchannel_stop_vifs(local);
 
+	/* ensure nullfunc is transmitted before leaving operating channel */
+	drv_flush(local, false);
+
 	ieee80211_configure_filter(local);
 
 	/* We need to set power level at maximum rate for scanning. */