From 6916f0c867a8bbb6d688ee73cec315b539c2f28e Mon Sep 17 00:00:00 2001
From: Shahar Levi <shahar_levi@ti.com>
Date: Mon, 16 May 2011 15:35:30 +0300
Subject: [PATCH] --- yaml --- r: 256213 b: refs/heads/master c:
 0e44eb209343663ad7041ebf9f5d4c393bd89ae9 h: refs/heads/master i:   256211:
 f232ecdff95eb5d647f978baf4966270e41c54ee v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/net/wireless/wl12xx/event.c | 11 +++++++----
 trunk/drivers/net/wireless/wl12xx/ps.c    |  8 +++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 1289f032a8bf..aa80d58c2cc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c84368e01a00f449d97e8a59e1b0c24dcf70a8b3
+refs/heads/master: 0e44eb209343663ad7041ebf9f5d4c393bd89ae9
diff --git a/trunk/drivers/net/wireless/wl12xx/event.c b/trunk/drivers/net/wireless/wl12xx/event.c
index 0c60ffea414d..a16dee58a664 100644
--- a/trunk/drivers/net/wireless/wl12xx/event.c
+++ b/trunk/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);
diff --git a/trunk/drivers/net/wireless/wl12xx/ps.c b/trunk/drivers/net/wireless/wl12xx/ps.c
index b59b67711a17..d3e377d7fe62 100644
--- a/trunk/drivers/net/wireless/wl12xx/ps.c
+++ b/trunk/drivers/net/wireless/wl12xx/ps.c
@@ -169,9 +169,11 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,
 		wl1271_debug(DEBUG_PSM, "leaving psm");
 
 		/* disable beacon early termination */
-		ret = wl1271_acx_bet_enable(wl, false);
-		if (ret < 0)
-			return ret;
+		if (wl->band == IEEE80211_BAND_2GHZ) {
+			ret = wl1271_acx_bet_enable(wl, false);
+			if (ret < 0)
+				return ret;
+		}
 
 		/* disable beacon filtering */
 		ret = wl1271_acx_beacon_filter_opt(wl, false);