commit 1205f5438f5a9a2dad3a29aa1c015e7bbd3b2b2b
author Christian Lamparter <chunkeey@googlemail.com> Thu Jun 30 20:34:54 2011 +0200
committer John W. Linville <linville@tuxdriver.com> Tue Jul 05 15:26:53 2011 -0400
tree 4023baba1892f5ecb86a7ddde6e11a11786b4dba
parent f3716fd7494ce5e2af3c6251275d989bfec98906

carl9170: allow PSM if the 5 GHz band is selected

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/ath/carl9170/fw.c

diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 221957c..39ddea5 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -237,7 +237,7 @@
 		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)) {