diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-18 02:55:13 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-18 02:55:13 +0300 |
| commit | 9d066a252786e1a18484a6283f82614d42a9f4ac (patch) | |
| tree | 72188d2f86b3d0c4100257c8d5734f2c648a8bc7 /drivers/net/wireless/realtek/rtlwifi/ps.c | |
| parent | 79ee2e8f730411a30b271d5f9cdeae189fa66174 (diff) | |
| parent | b00345d1994d588fa2687e1238fcd542f0320cba (diff) | |
| download | linux-9d066a252786e1a18484a6283f82614d42a9f4ac.tar.xz | |
Merge branches 'pm-opp' and 'pm-cpufreq-fixes'
* pm-opp:
PM / OPP: Add 'UNKNOWN' status for shared_opp in struct opp_table
* pm-cpufreq-fixes:
cpufreq: intel_pstate: Adjust _PSS[0] freqeuency if needed
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/ps.c')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/ps.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c index b69321d45f04..93579cac0d45 100644 --- a/drivers/net/wireless/realtek/rtlwifi/ps.c +++ b/drivers/net/wireless/realtek/rtlwifi/ps.c @@ -443,14 +443,10 @@ void rtl_lps_enter(struct ieee80211_hw *hw) spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag); - /* Idle for a while if we connect to AP a while ago. */ - if (mac->cnt_after_linked >= 2) { - if (ppsc->dot11_psmode == EACTIVE) { - RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, - "Enter 802.11 power save mode...\n"); - - rtl_lps_set_psmode(hw, EAUTOPS); - } + if (ppsc->dot11_psmode == EACTIVE) { + RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, + "Enter 802.11 power save mode...\n"); + rtl_lps_set_psmode(hw, EAUTOPS); } spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag); |