1 files changed, 8 insertions, 0 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7a8d4c494246..a16c9d724be1 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2192,6 +2192,7 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
 void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_managed *ifmgd;
+        u32 hw_flags;
 
         ifmgd = &sdata->u.mgd;
         INIT_WORK(&ifmgd->work, ieee80211_sta_work);
@@ -2211,6 +2212,13 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
                 IEEE80211_STA_AUTO_CHANNEL_SEL;
         if (sdata->local->hw.queues >= 4)
                 ifmgd->flags |= IEEE80211_STA_WMM_ENABLED;
+
+        hw_flags = sdata->local->hw.flags;
+
+        if (hw_flags & IEEE80211_HW_SUPPORTS_PS) {
+                ifmgd->powersave = CONFIG_MAC80211_DEFAULT_PS_VALUE;
+                sdata->local->hw.conf.dynamic_ps_timeout = 500;
+        }
 }
 
 /* configuration hooks */