leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

carl9170: allow PSM if the 5 GHz band is selected

Browse Source 
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Christian Lamparter 2011-06-30 20:34:54 +02:00 committed by John W. Linville
parent f3716fd749
commit 1205f5438f
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/ath/carl9170/carl9170.h
View File

@ -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 {

2
drivers/net/wireless/ath/carl9170/fw.c
View File

@ -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)) {

6
drivers/net/wireless/ath/carl9170/phy.c
View File

@ -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;