PM QOS update

[deliverable/linux.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c8cd169fc10ec7abb114fa566ff18d335efe78da..29de1965ff74cfb39ea61198ceb847664c4c001d 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -168,6 +168,8 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
        ht_changed = conf_is_ht(&local->hw.conf) != enable_ht ||
                     channel_type != local->hw.conf.channel_type;
 
+       if (local->tmp_channel)
+               local->tmp_channel_type = channel_type;
        local->oper_channel_type = channel_type;
 
        if (ht_changed) {
@@ -493,7 +495,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);