git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
carl9170
/
phy.c
diff --git
a/drivers/net/wireless/ath/carl9170/phy.c
b/drivers/net/wireless/ath/carl9170/phy.c
index
b6ae0e1
..
da1ab96
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;