From 4f48de22e6ce9130bb7175d83639bd90cdfcab83 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Thu, 30 Jun 2011 20:34:54 +0200
Subject: [PATCH] --- yaml --- r: 256185 b: refs/heads/master c:
 1205f5438f5a9a2dad3a29aa1c015e7bbd3b2b2b h: refs/heads/master i:   256183:
 c1daf3cb57008c5654579995a51ad17eceb54b9a v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/wireless/ath/carl9170/carl9170.h | 1 -
 trunk/drivers/net/wireless/ath/carl9170/fw.c       | 2 +-
 trunk/drivers/net/wireless/ath/carl9170/phy.c      | 6 ------
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e1ce00a4d522..cdcb5972de1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3716fd7494ce5e2af3c6251275d989bfec98906
+refs/heads/master: 1205f5438f5a9a2dad3a29aa1c015e7bbd3b2b2b
diff --git a/trunk/drivers/net/wireless/ath/carl9170/carl9170.h b/trunk/drivers/net/wireless/ath/carl9170/carl9170.h
index d96d03ff1209..f9a4655ea0b8 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/trunk/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -442,7 +442,6 @@ struct ar9170 {
 enum carl9170_ps_off_override_reasons {
 	PS_OFF_VIF	= BIT(0),
 	PS_OFF_BCN	= BIT(1),
-	PS_OFF_5GHZ	= BIT(2),
 };
 
 struct carl9170_ba_stats {
diff --git a/trunk/drivers/net/wireless/ath/carl9170/fw.c b/trunk/drivers/net/wireless/ath/carl9170/fw.c
index 221957c5d373..39ddea5794f7 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/fw.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/fw.c
@@ -237,7 +237,7 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
 		ar->disable_offload = true;
 	}
 
-	if (SUPP(CARL9170FW_PSM))
+	if (SUPP(CARL9170FW_PSM) && SUPP(CARL9170FW_FIXED_5GHZ_PSM))
 		ar->hw->flags |= IEEE80211_HW_SUPPORTS_PS;
 
 	if (!SUPP(CARL9170FW_USB_INIT_FIRMWARE)) {
diff --git a/trunk/drivers/net/wireless/ath/carl9170/phy.c b/trunk/drivers/net/wireless/ath/carl9170/phy.c
index b6ae0e179c8d..da1ab962ee48 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/phy.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/phy.c
@@ -1783,12 +1783,6 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
 		}
 	}
 
-	/* FIXME: PSM does not work in 5GHz Band */
-	if (channel->band == IEEE80211_BAND_5GHZ)
-		ar->ps.off_override |= PS_OFF_5GHZ;
-	else
-		ar->ps.off_override &= ~PS_OFF_5GHZ;
-
 	ar->channel = channel;
 	ar->ht_settings = new_ht;
 	return 0;