diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2014-02-20 15:41:51 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-21 09:28:52 +0100 |
| commit | 30f55dc171a32d60e3753c9e0a3cf33a4d6c4610 (patch) | |
| tree | f935f2e2f5962f3e8d38eaf9560eef7c1fe00856 | |
| parent | cfg80211: docbook: add interface combinations documentation (diff) | |
| download | linux-30f55dc171a32d60e3753c9e0a3cf33a4d6c4610.tar.xz linux-30f55dc171a32d60e3753c9e0a3cf33a4d6c4610.zip | |
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>
| -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, 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; |