summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-10-13 19:23:21 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-10-13 15:45:23 -0400
commite4b55957eb695b43055b6badec026628b24fe80a (patch)
treea8a2c293b8b4386a2c8b0bf248cd97a0df22949a
parent9c1d8e4affe6748d884a677cf5db19ae0c20ef07 (diff)
downloadlinux-3.10-e4b55957eb695b43055b6badec026628b24fe80a.tar.gz
linux-3.10-e4b55957eb695b43055b6badec026628b24fe80a.tar.bz2
linux-3.10-e4b55957eb695b43055b6badec026628b24fe80a.zip
mac80211: fix SMPS request
It looks like I submitted a different patch than I tested, because clearly the code in mac80211 is missing actually propagating the requested SMPS mode. Fix that! Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/ht.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 4214bb6e12f..75d679d75e6 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -291,6 +291,8 @@ void ieee80211_request_smps(struct ieee80211_vif *vif,
if (WARN_ON(smps_mode == IEEE80211_SMPS_OFF))
smps_mode = IEEE80211_SMPS_AUTOMATIC;
+ sdata->u.mgd.driver_smps_mode = smps_mode;
+
ieee80211_queue_work(&sdata->local->hw,
&sdata->u.mgd.request_smps_work);
}