summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ht.c
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2014-02-20 16:41:51 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-02-21 09:28:52 +0100
commit30f55dc171a32d60e3753c9e0a3cf33a4d6c4610 (patch)
treef935f2e2f5962f3e8d38eaf9560eef7c1fe00856 /net/mac80211/ht.c
parentb80edbc177800623dd07240e19e69c7b16ee5cba (diff)
downloadop-kernel-dev-30f55dc171a32d60e3753c9e0a3cf33a4d6c4610.zip
op-kernel-dev-30f55dc171a32d60e3753c9e0a3cf33a4d6c4610.tar.gz
mac80211: allow drivers to request SMPS off
Previously we were warning and using automatic when a driver sent an update request with SMPS off. This patch makes it possible for drivers to disable SMPS at runtime, for whatever reason. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ht.c')
-rw-r--r--net/mac80211/ht.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index afbe2b2..c150b68 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -482,8 +482,6 @@ void ieee80211_request_smps(struct ieee80211_vif *vif,
return;
if (vif->type == NL80211_IFTYPE_STATION) {
- if (WARN_ON(smps_mode == IEEE80211_SMPS_OFF))
- smps_mode = IEEE80211_SMPS_AUTOMATIC;
if (sdata->u.mgd.driver_smps_mode == smps_mode)
return;
sdata->u.mgd.driver_smps_mode = smps_mode;
OpenPOWER on IntegriCloud