Bläddra i källkod

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 <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Emmanuel Grumbach 12 år sedan
förälder
incheckning
349b196044
1 ändrade filer med 2 tillägg och 3 borttagningar
  1. 2 3
      net/mac80211/ht.c

+ 2 - 3
net/mac80211/ht.c

@@ -479,10 +479,9 @@ void ieee80211_request_smps(struct ieee80211_vif *vif,
 			 vif->type != NL80211_IFTYPE_AP))
 			 vif->type != NL80211_IFTYPE_AP))
 		return;
 		return;
 
 
-	if (WARN_ON(smps_mode == IEEE80211_SMPS_OFF))
-		smps_mode = IEEE80211_SMPS_AUTOMATIC;
-
 	if (vif->type == NL80211_IFTYPE_STATION) {
 	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)
 		if (sdata->u.mgd.driver_smps_mode == smps_mode)
 			return;
 			return;
 		sdata->u.mgd.driver_smps_mode = smps_mode;
 		sdata->u.mgd.driver_smps_mode = smps_mode;