From: Luciano Coelho <luciano.coelho@intel.com>
Date: Thu, 20 Feb 2014 14:41:51 +0000 (+0200)
Subject: mac80211: allow drivers to request SMPS off
X-Git-Tag: v5.15~18171^2~18^2^2~47^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30f55dc171a32d60e3753c9e0a3cf33a4d6c4610;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

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;