diff options
author | Luciano Coelho <luciano.coelho@intel.com> | 2014-02-20 09:41:51 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-21 03:28:52 -0500 |
commit | 30f55dc171a32d60e3753c9e0a3cf33a4d6c4610 (patch) | |
tree | f935f2e2f5962f3e8d38eaf9560eef7c1fe00856 /net | |
parent | b80edbc177800623dd07240e19e69c7b16ee5cba (diff) |
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')
-rw-r--r-- | net/mac80211/ht.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index afbe2b203c3e..c150b68436d7 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c | |||
@@ -482,8 +482,6 @@ void ieee80211_request_smps(struct ieee80211_vif *vif, | |||
482 | return; | 482 | return; |
483 | 483 | ||
484 | if (vif->type == NL80211_IFTYPE_STATION) { | 484 | if (vif->type == NL80211_IFTYPE_STATION) { |
485 | if (WARN_ON(smps_mode == IEEE80211_SMPS_OFF)) | ||
486 | smps_mode = IEEE80211_SMPS_AUTOMATIC; | ||
487 | if (sdata->u.mgd.driver_smps_mode == smps_mode) | 485 | if (sdata->u.mgd.driver_smps_mode == smps_mode) |
488 | return; | 486 | return; |
489 | sdata->u.mgd.driver_smps_mode = smps_mode; | 487 | sdata->u.mgd.driver_smps_mode = smps_mode; |