From: Emmanuel Grumbach Date: Tue, 7 Jan 2014 11:11:41 +0000 (+0200) Subject: mac80211: allow to set smps mode to OFF in AP mode X-Git-Tag: v3.14-rc1~94^2~3^2^2~42^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=349b196044d38a3bf5be2b4dd2fe28ca2f12a258;p=platform%2Fkernel%2Flinux-stable.git mac80211: allow to set smps mode to OFF in AP mode In managed mode, we should not ask for OFF mode because the power settings may still require DYNAMIC. In AP mode, this should be allowed since the default settings is OFF and AUTOMATIC is not allowed. Signed-off-by: Emmanuel Grumbach Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 9a8be8f..fab7b91 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -479,10 +479,9 @@ void ieee80211_request_smps(struct ieee80211_vif *vif, vif->type != NL80211_IFTYPE_AP)) return; - if (WARN_ON(smps_mode == IEEE80211_SMPS_OFF)) - smps_mode = IEEE80211_SMPS_AUTOMATIC; - 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;