From 2215cffa831f121a12003f59cab4c0cfacd5d1a7 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Fri, 3 Dec 2010 02:16:23 +0200 Subject: [PATCH] --- yaml --- r: 225088 b: refs/heads/master c: 0ab82b04ac83a05bda3ef8499f415fc6fd6ee206 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 757176c76aad..2fad6cf7c064 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 329b32fedc94fd9158f1635ac64f4ae6a00d374c +refs/heads/master: 0ab82b04ac83a05bda3ef8499f415fc6fd6ee206 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 3a1dde3c7956..59e2e06aa4e9 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -625,11 +625,12 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency) /* * Go to full PSM if the user configures a very low * latency requirement. - * The 2 second value is there for compatibility until - * the PM_QOS_NETWORK_LATENCY is configured with real - * values. + * The 2000 second value is there for compatibility + * until the PM_QOS_NETWORK_LATENCY is configured + * with real values. */ - if (latency > 1900000000 && latency != 2000000000) + if (latency > (1900 * USEC_PER_MSEC) && + latency != (2000 * USEC_PER_SEC)) timeout = 0; else timeout = 100;