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>

diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index d96d03ff1209202526b768763c540ceafdb3662c..f9a4655ea0b8b1d8381c40f6eff95d9fc52303ac 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/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/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 221957c5d37370830eef6c74ae3aacddcbb62f89..39ddea5794f703c45233600113ed94e3c3546a72 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/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/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index b6ae0e179c8d6cec059016d3f7650bca0f5a89c1..da1ab962ee4839cd52bb06c81e8c68a465c4016c 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/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;