Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 4d8989b8796067898b3318b08576b32bb6a4d346..fb6a1502b6dfa64980305c3bba380408ef3dde14 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2,6 +2,7 @@
  * mac80211 configuration hooks for cfg80211
  *
  * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2013-2014  Intel Mobile Communications GmbH
  *
  * This file is GPLv2 as found in COPYING.
  */
@@ -682,8 +683,19 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
        if (old)
                return -EALREADY;
 
-       /* TODO: make hostapd tell us what it wants */
-       sdata->smps_mode = IEEE80211_SMPS_OFF;
+       switch (params->smps_mode) {
+       case NL80211_SMPS_OFF:
+               sdata->smps_mode = IEEE80211_SMPS_OFF;
+               break;
+       case NL80211_SMPS_STATIC:
+               sdata->smps_mode = IEEE80211_SMPS_STATIC;
+               break;
+       case NL80211_SMPS_DYNAMIC:
+               sdata->smps_mode = IEEE80211_SMPS_DYNAMIC;
+               break;
+       default:
+               return -EINVAL;
+       }
        sdata->needed_rx_chains = sdata->local->rx_chains;
 
        mutex_lock(&local->mtx);
@@ -1977,8 +1989,13 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
                        return err;
        }
 
-       if (changed & WIPHY_PARAM_COVERAGE_CLASS) {
-               err = drv_set_coverage_class(local, wiphy->coverage_class);
+       if ((changed & WIPHY_PARAM_COVERAGE_CLASS) ||
+           (changed & WIPHY_PARAM_DYN_ACK)) {
+               s16 coverage_class;
+
+               coverage_class = changed & WIPHY_PARAM_COVERAGE_CLASS ?
+                                       wiphy->coverage_class : -1;
+               err = drv_set_coverage_class(local, coverage_class);
 
                if (err)
                        return err;
@@ -2351,6 +2368,58 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
        return 0;
 }
 
+static bool ieee80211_coalesce_started_roc(struct ieee80211_local *local,
+                                          struct ieee80211_roc_work *new_roc,
+                                          struct ieee80211_roc_work *cur_roc)
+{
+       unsigned long j = jiffies;
+       unsigned long cur_roc_end = cur_roc->hw_start_time +
+                                   msecs_to_jiffies(cur_roc->duration);
+       struct ieee80211_roc_work *next_roc;
+       int new_dur;
+
+       if (WARN_ON(!cur_roc->started || !cur_roc->hw_begun))
+               return false;
+
+       if (time_after(j + IEEE80211_ROC_MIN_LEFT, cur_roc_end))
+               return false;
+
+       ieee80211_handle_roc_started(new_roc);
+
+       new_dur = new_roc->duration - jiffies_to_msecs(cur_roc_end - j);
+
+       /* cur_roc is long enough - add new_roc to the dependents list. */
+       if (new_dur <= 0) {
+               list_add_tail(&new_roc->list, &cur_roc->dependents);
+               return true;
+       }
+
+       new_roc->duration = new_dur;
+
+       /*
+        * if cur_roc was already coalesced before, we might
+        * want to extend the next roc instead of adding
+        * a new one.
+        */
+       next_roc = list_entry(cur_roc->list.next,
+                             struct ieee80211_roc_work, list);
+       if (&next_roc->list != &local->roc_list &&
+           next_roc->chan == new_roc->chan &&
+           next_roc->sdata == new_roc->sdata &&
+           !WARN_ON(next_roc->started)) {
+               list_add_tail(&new_roc->list, &next_roc->dependents);
+               next_roc->duration = max(next_roc->duration,
+                                        new_roc->duration);
+               next_roc->type = max(next_roc->type, new_roc->type);
+               return true;
+       }
+
+       /* add right after cur_roc */
+       list_add(&new_roc->list, &cur_roc->list);
+
+       return true;
+}
+
 static int ieee80211_start_roc_work(struct ieee80211_local *local,
                                    struct ieee80211_sub_if_data *sdata,
                                    struct ieee80211_channel *channel,
@@ -2456,8 +2525,6 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
 
                /* If it has already started, it's more difficult ... */
                if (local->ops->remain_on_channel) {
-                       unsigned long j = jiffies;
-
                        /*
                         * In the offloaded ROC case, if it hasn't begun, add
                         * this new one to the dependent list to be handled
@@ -2480,28 +2547,8 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
                                break;
                        }
 
-                       if (time_before(j + IEEE80211_ROC_MIN_LEFT,
-                                       tmp->hw_start_time +
-                                       msecs_to_jiffies(tmp->duration))) {
-                               int new_dur;
-
-                               ieee80211_handle_roc_started(roc);
-
-                               new_dur = roc->duration -
-                                         jiffies_to_msecs(tmp->hw_start_time +
-                                                          msecs_to_jiffies(
-                                                               tmp->duration) -
-                                                          j);
-
-                               if (new_dur > 0) {
-                                       /* add right after tmp */
-                                       list_add(&roc->list, &tmp->list);
-                               } else {
-                                       list_add_tail(&roc->list,
-                                                     &tmp->dependents);
-                               }
+                       if (ieee80211_coalesce_started_roc(local, roc, tmp))
                                queued = true;
-                       }
                } else if (del_timer_sync(&tmp->work.timer)) {
                        unsigned long new_end;