xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source 
Conflicts:
	drivers/net/wireless/libertas_tf/cmd.c
	drivers/net/wireless/libertas_tf/main.c
This commit is contained in:
John W. Linville
2010-05-05 16:14:16 -04:00
parent 0a12761bcd adfba3c7c0
commit 83163244f8
140 changed files with 4761 additions and 1378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
net/mac80211/mlme.c
View File

@@ -478,6 +478,7 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
{
struct ieee80211_sub_if_data *sdata, *found = NULL;
int count = 0;
int timeout;
if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS)) {
local->ps_sdata = NULL;
@@ -511,6 +512,26 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
beaconint_us = ieee80211_tu_to_usec(
found->vif.bss_conf.beacon_int);
timeout = local->hw.conf.dynamic_ps_forced_timeout;
if (timeout < 0) {
/*
* The 2 second value is there for compatibility until
* the PM_QOS_NETWORK_LATENCY is configured with real
* values.
*/
if (latency == 2000000000)
timeout = 100;
else if (latency <= 50000)
timeout = 300;
else if (latency <= 100000)
timeout = 100;
else if (latency <= 500000)
timeout = 50;
else
timeout = 0;
}
local->hw.conf.dynamic_ps_timeout = timeout;
if (beaconint_us > latency) {
local->ps_sdata = NULL;
} else {