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

[pandora-kernel.git] / net / mac80211 / scan.c

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index e14c441..e1b0be7 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -510,7 +510,7 @@ static int ieee80211_scan_state_decision(struct ieee80211_local *local,
                bad_latency = time_after(jiffies +
                                ieee80211_scan_get_channel_time(next_chan),
                                local->leave_oper_channel_time +
-                               usecs_to_jiffies(pm_qos_requirement(PM_QOS_NETWORK_LATENCY)));
+                               usecs_to_jiffies(pm_qos_request(PM_QOS_NETWORK_LATENCY)));
 
                listen_int_exceeded = time_after(jiffies +
                                ieee80211_scan_get_channel_time(next_chan),