Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[safe/jmp/linux-2.6] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c6c1f49..0839c4e 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -556,7 +556,7 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
                s32 beaconint_us;
 
                if (latency < 0)
-                       latency = pm_qos_requirement(PM_QOS_NETWORK_LATENCY);
+                       latency = pm_qos_request(PM_QOS_NETWORK_LATENCY);
 
                beaconint_us = ieee80211_tu_to_usec(
                                        found->vif.bss_conf.beacon_int);