1 files changed, 25 insertions, 11 deletions

diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c
index 94bbd00ec31..a16dee58a66 100644
--- a/drivers/net/wireless/wl12xx/event.c
+++ b/drivers/net/wireless/wl12xx/event.c
@@ -133,10 +133,13 @@ static int wl1271_event_ps_report(struct wl1271 *wl,
                 if (ret < 0)
                         break;
 
-                /* enable beacon early termination */
-                ret = wl1271_acx_bet_enable(wl, true);
-                if (ret < 0)
-                        break;
+                /*
+                 * BET has only a minor effect in 5GHz and masks
+                 * channel switch IEs, so we only enable BET on 2.4GHz
+                */
+                if (wl->band == IEEE80211_BAND_2GHZ)
+                        /* enable beacon early termination */
+                        ret = wl1271_acx_bet_enable(wl, true);
 
                 if (wl->ps_compl) {
                         complete(wl->ps_compl);
@@ -183,6 +186,21 @@ static void wl1271_stop_ba_event(struct wl1271 *wl, u8 ba_allowed)
         ieee80211_stop_rx_ba_session(wl->vif, wl->ba_rx_bitmap, wl->bssid);
 }
 
+static void wl12xx_event_soft_gemini_sense(struct wl1271 *wl,
+                                               u8 enable)
+{
+        if (enable) {
+                /* disable dynamic PS when requested by the firmware */
+                ieee80211_disable_dyn_ps(wl->vif);
+                set_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags);
+        } else {
+                ieee80211_enable_dyn_ps(wl->vif);
+                clear_bit(WL1271_FLAG_SOFT_GEMINI, &wl->flags);
+                wl1271_recalc_rx_streaming(wl);
+        }
+
+}
+
 static void wl1271_event_mbox_dump(struct event_mailbox *mbox)
 {
         wl1271_debug(DEBUG_EVENT, "MBOX DUMP:");
@@ -226,14 +244,10 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
                 }
         }
 
-        /* disable dynamic PS when requested by the firmware */
         if (vector & SOFT_GEMINI_SENSE_EVENT_ID &&
-            wl->bss_type == BSS_TYPE_STA_BSS) {
-                if (mbox->soft_gemini_sense_info)
-                        ieee80211_disable_dyn_ps(wl->vif);
-                else
-                        ieee80211_enable_dyn_ps(wl->vif);
-        }
+            wl->bss_type == BSS_TYPE_STA_BSS)
+                wl12xx_event_soft_gemini_sense(wl,
+                                               mbox->soft_gemini_sense_info);
 
         /*
          * The BSS_LOSE_EVENT_ID is only needed while psm (and hence beacon