aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-09-10 07:07:35 -0400
committerJohannes Berg <johannes.berg@intel.com>2014-09-11 07:37:02 -0400
commitf69931748730763f8c8095fa88394cf9af75a578 (patch)
treed80d390be868ba2fcfa153fb1d2d37feaec5dc58 /net
parent18998c381b19bfc3c285361ff6200ded7444aa2c (diff)
mac80211: set smps_mode according to ap params
Take the requested smps mode from the ap params (instead of always starting with SMPS_OFF) Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 101ae6cfad81..fb6a1502b6df 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -683,8 +683,19 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
683 if (old) 683 if (old)
684 return -EALREADY; 684 return -EALREADY;
685 685
686 /* TODO: make hostapd tell us what it wants */ 686 switch (params->smps_mode) {
687 sdata->smps_mode = IEEE80211_SMPS_OFF; 687 case NL80211_SMPS_OFF:
688 sdata->smps_mode = IEEE80211_SMPS_OFF;
689 break;
690 case NL80211_SMPS_STATIC:
691 sdata->smps_mode = IEEE80211_SMPS_STATIC;
692 break;
693 case NL80211_SMPS_DYNAMIC:
694 sdata->smps_mode = IEEE80211_SMPS_DYNAMIC;
695 break;
696 default:
697 return -EINVAL;
698 }
688 sdata->needed_rx_chains = sdata->local->rx_chains; 699 sdata->needed_rx_chains = sdata->local->rx_chains;
689 700
690 mutex_lock(&local->mtx); 701 mutex_lock(&local->mtx);