3.4-stable patches

added patches:
	mac80211-synchronize-scan-off-on-channel-and-ps-states.patch

diff --git a/queue-3.4/mac80211-synchronize-scan-off-on-channel-and-ps-states.patch b/queue-3.4/mac80211-synchronize-scan-off-on-channel-and-ps-states.patch
new file mode 100644 (file)
index 0000000..b65e5d8
--- /dev/null
+++ b/queue-3.4/mac80211-synchronize-scan-off-on-channel-and-ps-states.patch
@@ -0,0 +1,168 @@
+From aacde9ee45225f7e0b90960f479aef83c66bfdc0 Mon Sep 17 00:00:00 2001
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: Thu, 20 Dec 2012 14:41:18 +0100
+Subject: mac80211: synchronize scan off/on-channel and PS states
+
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+
+commit aacde9ee45225f7e0b90960f479aef83c66bfdc0 upstream.
+
+Since:
+
+commit b23b025fe246f3acc2988eb6d400df34c27cb8ae
+Author: Ben Greear <greearb@candelatech.com>
+Date:   Fri Feb 4 11:54:17 2011 -0800
+
+    mac80211: Optimize scans on current operating channel.
+
+we do not disable PS while going back to operational channel (on
+ieee80211_scan_state_suspend) and deffer that until scan finish.
+But since we are allowed to send frames, we can send a frame to AP
+without PM bit set, so disable PS on AP side. Then when we switch
+to off-channel (in ieee80211_scan_state_resume) we do not enable PS.
+Hence we are off-channel with PS disabled, frames are not buffered
+by AP.
+
+To fix remove offchannel_ps_disable argument and always enable PS when
+going off-channel and disable it when going on-channel, like it was
+before.
+
+Cc: stable@vger.kernel.org # 2.6.39+
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+Tested-by: Seth Forshee <seth.forshee@canonical.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/mac80211/ieee80211_i.h |    6 ++----
+ net/mac80211/offchannel.c  |   17 ++++++-----------
+ net/mac80211/scan.c        |   15 +++++----------
+ net/mac80211/work.c        |    4 ++--
+ 4 files changed, 15 insertions(+), 27 deletions(-)
+
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -1264,10 +1264,8 @@ int ieee80211_request_sched_scan_stop(st
+ void ieee80211_sched_scan_stopped_work(struct work_struct *work);
+ 
+ /* off-channel helpers */
+-void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
+-                                  bool offchannel_ps_enable);
+-void ieee80211_offchannel_return(struct ieee80211_local *local,
+-                               bool offchannel_ps_disable);
++void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local);
++void ieee80211_offchannel_return(struct ieee80211_local *local);
+ void ieee80211_hw_roc_setup(struct ieee80211_local *local);
+ 
+ /* interface handling */
+--- a/net/mac80211/offchannel.c
++++ b/net/mac80211/offchannel.c
+@@ -103,8 +103,7 @@ static void ieee80211_offchannel_ps_disa
+       ieee80211_sta_reset_conn_monitor(sdata);
+ }
+ 
+-void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
+-                                  bool offchannel_ps_enable)
++void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local)
+ {
+       struct ieee80211_sub_if_data *sdata;
+ 
+@@ -129,8 +128,7 @@ void ieee80211_offchannel_stop_vifs(stru
+ 
+               if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
+                       netif_tx_stop_all_queues(sdata->dev);
+-                      if (offchannel_ps_enable &&
+-                          (sdata->vif.type == NL80211_IFTYPE_STATION) &&
++                      if (sdata->vif.type == NL80211_IFTYPE_STATION &&
+                           sdata->u.mgd.associated)
+                               ieee80211_offchannel_ps_enable(sdata, true);
+               }
+@@ -138,8 +136,7 @@ void ieee80211_offchannel_stop_vifs(stru
+       mutex_unlock(&local->iflist_mtx);
+ }
+ 
+-void ieee80211_offchannel_return(struct ieee80211_local *local,
+-                               bool offchannel_ps_disable)
++void ieee80211_offchannel_return(struct ieee80211_local *local)
+ {
+       struct ieee80211_sub_if_data *sdata;
+ 
+@@ -152,11 +149,9 @@ void ieee80211_offchannel_return(struct
+                       continue;
+ 
+               /* Tell AP we're back */
+-              if (offchannel_ps_disable &&
+-                  sdata->vif.type == NL80211_IFTYPE_STATION) {
+-                      if (sdata->u.mgd.associated)
+-                              ieee80211_offchannel_ps_disable(sdata);
+-              }
++              if (sdata->vif.type == NL80211_IFTYPE_STATION &&
++                  sdata->u.mgd.associated)
++                      ieee80211_offchannel_ps_disable(sdata);
+ 
+               if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
+                       /*
+--- a/net/mac80211/scan.c
++++ b/net/mac80211/scan.c
+@@ -329,7 +329,7 @@ static void __ieee80211_scan_completed(s
+       if (!was_hw_scan) {
+               ieee80211_configure_filter(local);
+               drv_sw_scan_complete(local);
+-              ieee80211_offchannel_return(local, true);
++              ieee80211_offchannel_return(local);
+       }
+ 
+       ieee80211_recalc_idle(local);
+@@ -374,7 +374,7 @@ static int ieee80211_start_sw_scan(struc
+       local->next_scan_state = SCAN_DECISION;
+       local->scan_channel_idx = 0;
+ 
+-      ieee80211_offchannel_stop_vifs(local, true);
++      ieee80211_offchannel_stop_vifs(local);
+ 
+       ieee80211_configure_filter(local);
+ 
+@@ -629,12 +629,8 @@ static void ieee80211_scan_state_suspend
+       local->scan_channel = NULL;
+       ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
+ 
+-      /*
+-       * Re-enable vifs and beaconing.  Leave PS
+-       * in off-channel state..will put that back
+-       * on-channel at the end of scanning.
+-       */
+-      ieee80211_offchannel_return(local, false);
++      /* disable PS */
++      ieee80211_offchannel_return(local);
+ 
+       *next_delay = HZ / 5;
+       /* afterwards, resume scan & go to next channel */
+@@ -644,8 +640,7 @@ static void ieee80211_scan_state_suspend
+ static void ieee80211_scan_state_resume(struct ieee80211_local *local,
+                                       unsigned long *next_delay)
+ {
+-      /* PS already is in off-channel mode */
+-      ieee80211_offchannel_stop_vifs(local, false);
++      ieee80211_offchannel_stop_vifs(local);
+ 
+       if (local->ops->flush) {
+               drv_flush(local, false);
+--- a/net/mac80211/work.c
++++ b/net/mac80211/work.c
+@@ -148,7 +148,7 @@ static void ieee80211_work_work(struct w
+               }
+ 
+               if (!started && !local->tmp_channel) {
+-                      ieee80211_offchannel_stop_vifs(local, true);
++                      ieee80211_offchannel_stop_vifs(local);
+ 
+                       local->tmp_channel = wk->chan;
+                       local->tmp_channel_type = wk->chan_type;
+@@ -220,7 +220,7 @@ static void ieee80211_work_work(struct w
+               local->tmp_channel = NULL;
+               ieee80211_hw_config(local, 0);
+ 
+-              ieee80211_offchannel_return(local, true);
++              ieee80211_offchannel_return(local);
+ 
+               /* give connection some time to breathe */
+               run_again(local, jiffies + HZ/2);

diff --git a/queue-3.4/series b/queue-3.4/series
index f3ceb0dba636497edb74269bcf1f0799b2953f4f..74f7cf63b0719815dcfac225ff208be92645062d 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -23,3 +23,4 @@ edac-test-correct-variable-in-store-function.patch
 asoc-wm2200-correct-mixer-values-and-text.patch
 bluetooth-fix-incorrect-strncpy-in-hidp_setup_hid.patch
 iommu-intel-disable-dmar-for-g4x-integrated-gfx.patch
+mac80211-synchronize-scan-off-on-channel-and-ps-states.patch