arm64: rockchip_defconfig: enable drm display drivers
[firefly-linux-kernel-4.4.55.git] / net / mac80211 / sta_info.c
index 11216bc13b27565a4734638014ad01f5d2d88911..67066d048e6fb00033a660e7bbaad11d5621b1ac 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Copyright 2002-2005, Instant802 Networks, Inc.
  * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
+ * Copyright 2013-2014  Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * freed before they are done using it.
  */
 
+static const struct rhashtable_params sta_rht_params = {
+       .nelem_hint = 3, /* start small */
+       .automatic_shrinking = true,
+       .head_offset = offsetof(struct sta_info, hash_node),
+       .key_offset = offsetof(struct sta_info, addr),
+       .key_len = ETH_ALEN,
+       .hashfn = sta_addr_hash,
+       .max_size = CONFIG_MAC80211_STA_HASH_MAX_SIZE,
+};
+
 /* Caller must hold local->sta_mtx */
 static int sta_info_hash_del(struct ieee80211_local *local,
                             struct sta_info *sta)
 {
-       struct sta_info *s;
-
-       s = rcu_dereference_protected(local->sta_hash[STA_HASH(sta->sta.addr)],
-                                     lockdep_is_held(&local->sta_mtx));
-       if (!s)
-               return -ENOENT;
-       if (s == sta) {
-               rcu_assign_pointer(local->sta_hash[STA_HASH(sta->sta.addr)],
-                                  s->hnext);
-               return 0;
-       }
-
-       while (rcu_access_pointer(s->hnext) &&
-              rcu_access_pointer(s->hnext) != sta)
-               s = rcu_dereference_protected(s->hnext,
-                                       lockdep_is_held(&local->sta_mtx));
-       if (rcu_access_pointer(s->hnext)) {
-               rcu_assign_pointer(s->hnext, sta->hnext);
-               return 0;
-       }
-
-       return -ENOENT;
+       return rhashtable_remove_fast(&local->sta_hash, &sta->hash_node,
+                                     sta_rht_params);
 }
 
-static void cleanup_single_sta(struct sta_info *sta)
+static void __cleanup_single_sta(struct sta_info *sta)
 {
        int ac, i;
        struct tid_ampdu_tx *tid_tx;
@@ -99,24 +90,9 @@ static void cleanup_single_sta(struct sta_info *sta)
        struct ieee80211_local *local = sdata->local;
        struct ps_data *ps;
 
-       /*
-        * At this point, when being called as call_rcu callback,
-        * neither mac80211 nor the driver can reference this
-        * sta struct any more except by still existing timers
-        * associated with this station that we clean up below.
-        *
-        * Note though that this still uses the sdata and even
-        * calls the driver in AP and mesh mode, so interfaces
-        * of those types mush use call sta_info_flush_cleanup()
-        * (typically via sta_info_flush()) before deconfiguring
-        * the driver.
-        *
-        * In station mode, nothing happens here so it doesn't
-        * have to (and doesn't) do that, this is intentional to
-        * speed up roaming.
-        */
-
-       if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
+       if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
+           test_sta_flag(sta, WLAN_STA_PS_DRIVER) ||
+           test_sta_flag(sta, WLAN_STA_PS_DELIVER)) {
                if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||
                    sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
                        ps = &sdata->bss->ps;
@@ -126,9 +102,20 @@ static void cleanup_single_sta(struct sta_info *sta)
                        return;
 
                clear_sta_flag(sta, WLAN_STA_PS_STA);
+               clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
+               clear_sta_flag(sta, WLAN_STA_PS_DELIVER);
 
                atomic_dec(&ps->num_sta_ps);
-               sta_info_recalc_tim(sta);
+       }
+
+       if (sta->sta.txq[0]) {
+               for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) {
+                       struct txq_info *txqi = to_txq_info(sta->sta.txq[i]);
+                       int n = skb_queue_len(&txqi->queue);
+
+                       ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
+                       atomic_sub(n, &sdata->txqs_len[txqi->txq.ac]);
+               }
        }
 
        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
@@ -140,7 +127,7 @@ static void cleanup_single_sta(struct sta_info *sta)
        if (ieee80211_vif_is_mesh(&sdata->vif))
                mesh_sta_cleanup(sta);
 
-       cancel_work_sync(&sta->drv_unblock_wk);
+       cancel_work_sync(&sta->drv_deliver_wk);
 
        /*
         * Destroy aggregation state here. It would be nice to wait for the
@@ -149,45 +136,22 @@ static void cleanup_single_sta(struct sta_info *sta)
         * directly by station destruction.
         */
        for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
+               kfree(sta->ampdu_mlme.tid_start_tx[i]);
                tid_tx = rcu_dereference_raw(sta->ampdu_mlme.tid_tx[i]);
                if (!tid_tx)
                        continue;
                ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending);
                kfree(tid_tx);
        }
-
-       sta_info_free(local, sta);
-}
-
-void ieee80211_cleanup_sdata_stas(struct ieee80211_sub_if_data *sdata)
-{
-       struct sta_info *sta;
-
-       spin_lock_bh(&sdata->cleanup_stations_lock);
-       while (!list_empty(&sdata->cleanup_stations)) {
-               sta = list_first_entry(&sdata->cleanup_stations,
-                                      struct sta_info, list);
-               list_del(&sta->list);
-               spin_unlock_bh(&sdata->cleanup_stations_lock);
-
-               cleanup_single_sta(sta);
-
-               spin_lock_bh(&sdata->cleanup_stations_lock);
-       }
-
-       spin_unlock_bh(&sdata->cleanup_stations_lock);
 }
 
-static void free_sta_rcu(struct rcu_head *h)
+static void cleanup_single_sta(struct sta_info *sta)
 {
-       struct sta_info *sta = container_of(h, struct sta_info, rcu_head);
        struct ieee80211_sub_if_data *sdata = sta->sdata;
+       struct ieee80211_local *local = sdata->local;
 
-       spin_lock(&sdata->cleanup_stations_lock);
-       list_add_tail(&sta->list, &sdata->cleanup_stations);
-       spin_unlock(&sdata->cleanup_stations_lock);
-
-       ieee80211_queue_work(&sdata->local->hw, &sdata->cleanup_stations_wk);
+       __cleanup_single_sta(sta);
+       sta_info_free(local, sta);
 }
 
 /* protected by RCU */
@@ -196,17 +160,23 @@ struct sta_info *sta_info_get(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta;
+       struct rhash_head *tmp;
+       const struct bucket_table *tbl;
 
-       sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
-                                   lockdep_is_held(&local->sta_mtx));
-       while (sta) {
-               if (sta->sdata == sdata &&
-                   ether_addr_equal(sta->sta.addr, addr))
-                       break;
-               sta = rcu_dereference_check(sta->hnext,
-                                           lockdep_is_held(&local->sta_mtx));
+       rcu_read_lock();
+       tbl = rht_dereference_rcu(local->sta_hash.tbl, &local->sta_hash);
+
+       for_each_sta_info(local, tbl, addr, sta, tmp) {
+               if (sta->sdata == sdata) {
+                       rcu_read_unlock();
+                       /* this is safe as the caller must already hold
+                        * another rcu read section or the mutex
+                        */
+                       return sta;
+               }
        }
-       return sta;
+       rcu_read_unlock();
+       return NULL;
 }
 
 /*
@@ -218,18 +188,24 @@ struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta;
+       struct rhash_head *tmp;
+       const struct bucket_table *tbl;
 
-       sta = rcu_dereference_check(local->sta_hash[STA_HASH(addr)],
-                                   lockdep_is_held(&local->sta_mtx));
-       while (sta) {
-               if ((sta->sdata == sdata ||
-                    (sta->sdata->bss && sta->sdata->bss == sdata->bss)) &&
-                   ether_addr_equal(sta->sta.addr, addr))
-                       break;
-               sta = rcu_dereference_check(sta->hnext,
-                                           lockdep_is_held(&local->sta_mtx));
+       rcu_read_lock();
+       tbl = rht_dereference_rcu(local->sta_hash.tbl, &local->sta_hash);
+
+       for_each_sta_info(local, tbl, addr, sta, tmp) {
+               if (sta->sdata == sdata ||
+                   (sta->sdata->bss && sta->sdata->bss == sdata->bss)) {
+                       rcu_read_unlock();
+                       /* this is safe as the caller must already hold
+                        * another rcu read section or the mutex
+                        */
+                       return sta;
+               }
        }
-       return sta;
+       rcu_read_unlock();
+       return NULL;
 }
 
 struct sta_info *sta_info_get_by_idx(struct ieee80211_sub_if_data *sdata,
@@ -270,56 +246,51 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
 
        sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
 
+       if (sta->sta.txq[0])
+               kfree(to_txq_info(sta->sta.txq[0]));
+       kfree(rcu_dereference_raw(sta->sta.rates));
+#ifdef CONFIG_MAC80211_MESH
+       kfree(sta->mesh);
+#endif
        kfree(sta);
 }
 
 /* Caller must hold local->sta_mtx */
-static void sta_info_hash_add(struct ieee80211_local *local,
-                             struct sta_info *sta)
+static int sta_info_hash_add(struct ieee80211_local *local,
+                            struct sta_info *sta)
 {
-       lockdep_assert_held(&local->sta_mtx);
-       sta->hnext = local->sta_hash[STA_HASH(sta->sta.addr)];
-       rcu_assign_pointer(local->sta_hash[STA_HASH(sta->sta.addr)], sta);
+       return rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,
+                                     sta_rht_params);
 }
 
-static void sta_unblock(struct work_struct *wk)
+static void sta_deliver_ps_frames(struct work_struct *wk)
 {
        struct sta_info *sta;
 
-       sta = container_of(wk, struct sta_info, drv_unblock_wk);
+       sta = container_of(wk, struct sta_info, drv_deliver_wk);
 
        if (sta->dead)
                return;
 
-       if (!test_sta_flag(sta, WLAN_STA_PS_STA)) {
-               local_bh_disable();
+       local_bh_disable();
+       if (!test_sta_flag(sta, WLAN_STA_PS_STA))
                ieee80211_sta_ps_deliver_wakeup(sta);
-               local_bh_enable();
-       } else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL)) {
-               clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
-
-               local_bh_disable();
+       else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL))
                ieee80211_sta_ps_deliver_poll_response(sta);
-               local_bh_enable();
-       } else if (test_and_clear_sta_flag(sta, WLAN_STA_UAPSD)) {
-               clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
-
-               local_bh_disable();
+       else if (test_and_clear_sta_flag(sta, WLAN_STA_UAPSD))
                ieee80211_sta_ps_deliver_uapsd(sta);
-               local_bh_enable();
-       } else
-               clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
+       local_bh_enable();
 }
 
 static int sta_prepare_rate_control(struct ieee80211_local *local,
                                    struct sta_info *sta, gfp_t gfp)
 {
-       if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
+       if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL))
                return 0;
 
        sta->rate_ctrl = local->rate_ctrl;
        sta->rate_ctrl_priv = rate_control_alloc_sta(sta->rate_ctrl,
-                                                    &sta->sta, gfp);
+                                                    sta, gfp);
        if (!sta->rate_ctrl_priv)
                return -ENOMEM;
 
@@ -330,40 +301,67 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
                                const u8 *addr, gfp_t gfp)
 {
        struct ieee80211_local *local = sdata->local;
+       struct ieee80211_hw *hw = &local->hw;
        struct sta_info *sta;
-       struct timespec uptime;
        int i;
 
-       sta = kzalloc(sizeof(*sta) + local->hw.sta_data_size, gfp);
+       sta = kzalloc(sizeof(*sta) + hw->sta_data_size, gfp);
        if (!sta)
                return NULL;
 
        spin_lock_init(&sta->lock);
-       INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
+       spin_lock_init(&sta->ps_lock);
+       INIT_WORK(&sta->drv_deliver_wk, sta_deliver_ps_frames);
        INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
        mutex_init(&sta->ampdu_mlme.mtx);
 #ifdef CONFIG_MAC80211_MESH
-       if (ieee80211_vif_is_mesh(&sdata->vif) &&
-           !sdata->u.mesh.user_mpm)
-               init_timer(&sta->plink_timer);
+       if (ieee80211_vif_is_mesh(&sdata->vif)) {
+               sta->mesh = kzalloc(sizeof(*sta->mesh), gfp);
+               if (!sta->mesh)
+                       goto free;
+               spin_lock_init(&sta->mesh->plink_lock);
+               if (ieee80211_vif_is_mesh(&sdata->vif) &&
+                   !sdata->u.mesh.user_mpm)
+                       init_timer(&sta->mesh->plink_timer);
+               sta->mesh->nonpeer_pm = NL80211_MESH_POWER_ACTIVE;
+       }
 #endif
 
+       memcpy(sta->addr, addr, ETH_ALEN);
        memcpy(sta->sta.addr, addr, ETH_ALEN);
        sta->local = local;
        sta->sdata = sdata;
-       sta->last_rx = jiffies;
+       sta->rx_stats.last_rx = jiffies;
 
        sta->sta_state = IEEE80211_STA_NONE;
 
-       do_posix_clock_monotonic_gettime(&uptime);
-       sta->last_connected = uptime.tv_sec;
-       ewma_init(&sta->avg_signal, 1024, 8);
+       /* Mark TID as unreserved */
+       sta->reserved_tid = IEEE80211_TID_UNRESERVED;
 
-       if (sta_prepare_rate_control(local, sta, gfp)) {
-               kfree(sta);
-               return NULL;
+       sta->last_connected = ktime_get_seconds();
+       ewma_signal_init(&sta->rx_stats.avg_signal);
+       for (i = 0; i < ARRAY_SIZE(sta->rx_stats.chain_signal_avg); i++)
+               ewma_signal_init(&sta->rx_stats.chain_signal_avg[i]);
+
+       if (local->ops->wake_tx_queue) {
+               void *txq_data;
+               int size = sizeof(struct txq_info) +
+                          ALIGN(hw->txq_data_size, sizeof(void *));
+
+               txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp);
+               if (!txq_data)
+                       goto free;
+
+               for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) {
+                       struct txq_info *txq = txq_data + i * size;
+
+                       ieee80211_init_tx_queue(sdata, sta, txq, i);
+               }
        }
 
+       if (sta_prepare_rate_control(local, sta, gfp))
+               goto free_txq;
+
        for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
                /*
                 * timer_to_tid must be initialized with identity mapping
@@ -381,10 +379,44 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
                sta->last_seq_ctrl[i] = cpu_to_le16(USHRT_MAX);
 
        sta->sta.smps_mode = IEEE80211_SMPS_OFF;
+       if (sdata->vif.type == NL80211_IFTYPE_AP ||
+           sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+               struct ieee80211_supported_band *sband =
+                       hw->wiphy->bands[ieee80211_get_sdata_band(sdata)];
+               u8 smps = (sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >>
+                               IEEE80211_HT_CAP_SM_PS_SHIFT;
+               /*
+                * Assume that hostapd advertises our caps in the beacon and
+                * this is the known_smps_mode for a station that just assciated
+                */
+               switch (smps) {
+               case WLAN_HT_SMPS_CONTROL_DISABLED:
+                       sta->known_smps_mode = IEEE80211_SMPS_OFF;
+                       break;
+               case WLAN_HT_SMPS_CONTROL_STATIC:
+                       sta->known_smps_mode = IEEE80211_SMPS_STATIC;
+                       break;
+               case WLAN_HT_SMPS_CONTROL_DYNAMIC:
+                       sta->known_smps_mode = IEEE80211_SMPS_DYNAMIC;
+                       break;
+               default:
+                       WARN_ON(1);
+               }
+       }
 
        sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr);
 
        return sta;
+
+free_txq:
+       if (sta->sta.txq[0])
+               kfree(to_txq_info(sta->sta.txq[0]));
+free:
+#ifdef CONFIG_MAC80211_MESH
+       kfree(sta->mesh);
+#endif
+       kfree(sta);
+       return NULL;
 }
 
 static int sta_info_insert_check(struct sta_info *sta)
@@ -452,40 +484,53 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
 {
        struct ieee80211_local *local = sta->local;
        struct ieee80211_sub_if_data *sdata = sta->sdata;
-       struct station_info sinfo;
+       struct station_info *sinfo;
        int err = 0;
 
        lockdep_assert_held(&local->sta_mtx);
 
+       sinfo = kzalloc(sizeof(struct station_info), GFP_KERNEL);
+       if (!sinfo) {
+               err = -ENOMEM;
+               goto out_err;
+       }
+
        /* check if STA exists already */
        if (sta_info_get_bss(sdata, sta->sta.addr)) {
                err = -EEXIST;
                goto out_err;
        }
 
-       /* notify driver */
-       err = sta_info_insert_drv_state(local, sdata, sta);
-       if (err)
-               goto out_err;
-
        local->num_sta++;
        local->sta_generation++;
        smp_mb();
 
+       /* simplify things and don't accept BA sessions yet */
+       set_sta_flag(sta, WLAN_STA_BLOCK_BA);
+
        /* make the station visible */
-       sta_info_hash_add(local, sta);
+       err = sta_info_hash_add(local, sta);
+       if (err)
+               goto out_drop_sta;
+
+       list_add_tail_rcu(&sta->list, &local->sta_list);
 
-       list_add_rcu(&sta->list, &local->sta_list);
+       /* notify driver */
+       err = sta_info_insert_drv_state(local, sdata, sta);
+       if (err)
+               goto out_remove;
 
        set_sta_flag(sta, WLAN_STA_INSERTED);
+       /* accept BA sessions now */
+       clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
 
+       ieee80211_recalc_min_chandef(sdata);
        ieee80211_sta_debugfs_add(sta);
        rate_control_add_sta_debugfs(sta);
 
-       memset(&sinfo, 0, sizeof(sinfo));
-       sinfo.filled = 0;
-       sinfo.generation = local->sta_generation;
-       cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);
+       sinfo->generation = local->sta_generation;
+       cfg80211_new_sta(sdata->dev, sta->sta.addr, sinfo, GFP_KERNEL);
+       kfree(sinfo);
 
        sta_dbg(sdata, "Inserted STA %pM\n", sta->sta.addr);
 
@@ -497,6 +542,13 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
                mesh_accept_plinks_update(sdata);
 
        return 0;
+ out_remove:
+       sta_info_hash_del(local, sta);
+       list_del_rcu(&sta->list);
+ out_drop_sta:
+       local->num_sta--;
+       synchronize_net();
+       __cleanup_single_sta(sta);
  out_err:
        mutex_unlock(&local->sta_mtx);
        rcu_read_lock();
@@ -506,7 +558,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
 int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU)
 {
        struct ieee80211_local *local = sta->local;
-       int err = 0;
+       int err;
 
        might_sleep();
 
@@ -524,7 +576,6 @@ int sta_info_insert_rcu(struct sta_info *sta) __acquires(RCU)
 
        return 0;
  out_free:
-       BUG_ON(!err);
        sta_info_free(local, sta);
        return err;
 }
@@ -583,14 +634,14 @@ static unsigned long ieee80211_tids_for_ac(int ac)
        }
 }
 
-void sta_info_recalc_tim(struct sta_info *sta)
+static void __sta_info_recalc_tim(struct sta_info *sta, bool ignore_pending)
 {
        struct ieee80211_local *local = sta->local;
        struct ps_data *ps;
        bool indicate_tim = false;
        u8 ignore_for_tim = sta->sta.uapsd_queues;
        int ac;
-       u16 id;
+       u16 id = sta->sta.aid;
 
        if (sta->sdata->vif.type == NL80211_IFTYPE_AP ||
            sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
@@ -598,19 +649,16 @@ void sta_info_recalc_tim(struct sta_info *sta)
                        return;
 
                ps = &sta->sdata->bss->ps;
-               id = sta->sta.aid;
 #ifdef CONFIG_MAC80211_MESH
        } else if (ieee80211_vif_is_mesh(&sta->sdata->vif)) {
                ps = &sta->sdata->u.mesh.ps;
-               /* TIM map only for PLID <= IEEE80211_MAX_AID */
-               id = le16_to_cpu(sta->plid) % IEEE80211_MAX_AID;
 #endif
        } else {
                return;
        }
 
        /* No need to do anything if the driver does all */
-       if (local->hw.flags & IEEE80211_HW_AP_LINK_PS)
+       if (ieee80211_hw_check(&local->hw, AP_LINK_PS))
                return;
 
        if (sta->dead)
@@ -625,6 +673,9 @@ void sta_info_recalc_tim(struct sta_info *sta)
        if (ignore_for_tim == BIT(IEEE80211_NUM_ACS) - 1)
                ignore_for_tim = 0;
 
+       if (ignore_pending)
+               ignore_for_tim = BIT(IEEE80211_NUM_ACS) - 1;
+
        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
                unsigned long tids;
 
@@ -640,6 +691,8 @@ void sta_info_recalc_tim(struct sta_info *sta)
 
                indicate_tim |=
                        sta->driver_buffered_tids & tids;
+               indicate_tim |=
+                       sta->txq_buffered_tids & tids;
        }
 
  done:
@@ -653,7 +706,7 @@ void sta_info_recalc_tim(struct sta_info *sta)
        else
                __bss_tim_clear(ps->tim, id);
 
-       if (local->ops->set_tim) {
+       if (local->ops->set_tim && !WARN_ON(sta->dead)) {
                local->tim_in_locked_section = true;
                drv_set_tim(local, &sta->sta, indicate_tim);
                local->tim_in_locked_section = false;
@@ -663,6 +716,11 @@ out_unlock:
        spin_unlock_bh(&local->tim_lock);
 }
 
+void sta_info_recalc_tim(struct sta_info *sta)
+{
+       __sta_info_recalc_tim(sta, false);
+}
+
 static bool sta_info_buffer_expired(struct sta_info *sta, struct sk_buff *skb)
 {
        struct ieee80211_tx_info *info;
@@ -779,7 +837,7 @@ static bool sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
        return have_buffered;
 }
 
-int __must_check __sta_info_destroy(struct sta_info *sta)
+static int __must_check __sta_info_destroy_part1(struct sta_info *sta)
 {
        struct ieee80211_local *local;
        struct ieee80211_sub_if_data *sdata;
@@ -805,22 +863,55 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
        ieee80211_sta_tear_down_BA_sessions(sta, AGG_STOP_DESTROY_STA);
 
        ret = sta_info_hash_del(local, sta);
-       if (ret)
+       if (WARN_ON(ret))
                return ret;
 
+       /*
+        * for TDLS peers, make sure to return to the base channel before
+        * removal.
+        */
+       if (test_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL)) {
+               drv_tdls_cancel_channel_switch(local, sdata, &sta->sta);
+               clear_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL);
+       }
+
        list_del_rcu(&sta->list);
 
-       /* this always calls synchronize_net() */
+       drv_sta_pre_rcu_remove(local, sta->sdata, sta);
+
+       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
+           rcu_access_pointer(sdata->u.vlan.sta) == sta)
+               RCU_INIT_POINTER(sdata->u.vlan.sta, NULL);
+
+       return 0;
+}
+
+static void __sta_info_destroy_part2(struct sta_info *sta)
+{
+       struct ieee80211_local *local = sta->local;
+       struct ieee80211_sub_if_data *sdata = sta->sdata;
+       struct station_info *sinfo;
+       int ret;
+
+       /*
+        * NOTE: This assumes at least synchronize_net() was done
+        *       after _part1 and before _part2!
+        */
+
+       might_sleep();
+       lockdep_assert_held(&local->sta_mtx);
+
+       /* now keys can no longer be reached */
        ieee80211_free_sta_keys(local, sta);
 
+       /* disable TIM bit - last chance to tell driver */
+       __sta_info_recalc_tim(sta, true);
+
        sta->dead = true;
 
        local->num_sta--;
        local->sta_generation++;
 
-       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-               RCU_INIT_POINTER(sdata->u.vlan.sta, NULL);
-
        while (sta->sta_state > IEEE80211_STA_NONE) {
                ret = sta_info_move_state(sta, sta->sta_state - 1);
                if (ret) {
@@ -837,12 +928,29 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
 
        sta_dbg(sdata, "Removed STA %pM\n", sta->sta.addr);
 
-       cfg80211_del_sta(sdata->dev, sta->sta.addr, GFP_KERNEL);
+       sinfo = kzalloc(sizeof(*sinfo), GFP_KERNEL);
+       if (sinfo)
+               sta_set_sinfo(sta, sinfo);
+       cfg80211_del_sta_sinfo(sdata->dev, sta->sta.addr, sinfo, GFP_KERNEL);
+       kfree(sinfo);
 
        rate_control_remove_sta_debugfs(sta);
        ieee80211_sta_debugfs_remove(sta);
+       ieee80211_recalc_min_chandef(sdata);
+
+       cleanup_single_sta(sta);
+}
+
+int __must_check __sta_info_destroy(struct sta_info *sta)
+{
+       int err = __sta_info_destroy_part1(sta);
+
+       if (err)
+               return err;
 
-       call_rcu(&sta->rcu_head, free_sta_rcu);
+       synchronize_net();
+
+       __sta_info_destroy_part2(sta);
 
        return 0;
 }
@@ -896,48 +1004,67 @@ static void sta_info_cleanup(unsigned long data)
                  round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL));
 }
 
-void sta_info_init(struct ieee80211_local *local)
+u32 sta_addr_hash(const void *key, u32 length, u32 seed)
 {
+       return jhash(key, ETH_ALEN, seed);
+}
+
+int sta_info_init(struct ieee80211_local *local)
+{
+       int err;
+
+       err = rhashtable_init(&local->sta_hash, &sta_rht_params);
+       if (err)
+               return err;
+
        spin_lock_init(&local->tim_lock);
        mutex_init(&local->sta_mtx);
        INIT_LIST_HEAD(&local->sta_list);
 
        setup_timer(&local->sta_cleanup, sta_info_cleanup,
                    (unsigned long)local);
+       return 0;
 }
 
 void sta_info_stop(struct ieee80211_local *local)
 {
        del_timer_sync(&local->sta_cleanup);
+       rhashtable_destroy(&local->sta_hash);
 }
 
 
-int sta_info_flush_defer(struct ieee80211_sub_if_data *sdata)
+int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans)
 {
        struct ieee80211_local *local = sdata->local;
        struct sta_info *sta, *tmp;
+       LIST_HEAD(free_list);
        int ret = 0;
 
        might_sleep();
 
+       WARN_ON(vlans && sdata->vif.type != NL80211_IFTYPE_AP);
+       WARN_ON(vlans && !sdata->bss);
+
        mutex_lock(&local->sta_mtx);
        list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
-               if (sdata == sta->sdata) {
-                       WARN_ON(__sta_info_destroy(sta));
+               if (sdata == sta->sdata ||
+                   (vlans && sdata->bss == sta->sdata->bss)) {
+                       if (!WARN_ON(__sta_info_destroy_part1(sta)))
+                               list_add(&sta->free_list, &free_list);
                        ret++;
                }
        }
+
+       if (!list_empty(&free_list)) {
+               synchronize_net();
+               list_for_each_entry_safe(sta, tmp, &free_list, free_list)
+                       __sta_info_destroy_part2(sta);
+       }
        mutex_unlock(&local->sta_mtx);
 
        return ret;
 }
 
-void sta_info_flush_cleanup(struct ieee80211_sub_if_data *sdata)
-{
-       ieee80211_cleanup_sdata_stas(sdata);
-       cancel_work_sync(&sdata->cleanup_stations_wk);
-}
-
 void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                          unsigned long exp_time)
 {
@@ -950,7 +1077,7 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                if (sdata != sta->sdata)
                        continue;
 
-               if (time_after(jiffies, sta->last_rx + exp_time)) {
+               if (time_after(jiffies, sta->rx_stats.last_rx + exp_time)) {
                        sta_dbg(sta->sdata, "expiring inactive STA %pM\n",
                                sta->sta.addr);
 
@@ -966,16 +1093,21 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
 }
 
 struct ieee80211_sta *ieee80211_find_sta_by_ifaddr(struct ieee80211_hw *hw,
-                                              const u8 *addr,
-                                              const u8 *localaddr)
+                                                  const u8 *addr,
+                                                  const u8 *localaddr)
 {
-       struct sta_info *sta, *nxt;
+       struct ieee80211_local *local = hw_to_local(hw);
+       struct sta_info *sta;
+       struct rhash_head *tmp;
+       const struct bucket_table *tbl;
+
+       tbl = rht_dereference_rcu(local->sta_hash.tbl, &local->sta_hash);
 
        /*
         * Just return a random station if localaddr is NULL
         * ... first in list.
         */
-       for_each_sta_info(hw_to_local(hw), addr, sta, nxt) {
+       for_each_sta_info(local, tbl, addr, sta, tmp) {
                if (localaddr &&
                    !ether_addr_equal(sta->sdata->vif.addr, localaddr))
                        continue;
@@ -1007,44 +1139,51 @@ struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_vif *vif,
 }
 EXPORT_SYMBOL(ieee80211_find_sta);
 
-static void clear_sta_ps_flags(void *_sta)
+/* powersave support code */
+void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 {
-       struct sta_info *sta = _sta;
        struct ieee80211_sub_if_data *sdata = sta->sdata;
+       struct ieee80211_local *local = sdata->local;
+       struct sk_buff_head pending;
+       int filtered = 0, buffered = 0, ac, i;
+       unsigned long flags;
        struct ps_data *ps;
 
-       if (sdata->vif.type == NL80211_IFTYPE_AP ||
-           sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+               sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
+                                    u.ap);
+
+       if (sdata->vif.type == NL80211_IFTYPE_AP)
                ps = &sdata->bss->ps;
        else if (ieee80211_vif_is_mesh(&sdata->vif))
                ps = &sdata->u.mesh.ps;
        else
                return;
 
-       clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
-       if (test_and_clear_sta_flag(sta, WLAN_STA_PS_STA))
-               atomic_dec(&ps->num_sta_ps);
-}
-
-/* powersave support code */
-void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
-{
-       struct ieee80211_sub_if_data *sdata = sta->sdata;
-       struct ieee80211_local *local = sdata->local;
-       struct sk_buff_head pending;
-       int filtered = 0, buffered = 0, ac;
-       unsigned long flags;
-
        clear_sta_flag(sta, WLAN_STA_SP);
 
        BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1);
        sta->driver_buffered_tids = 0;
+       sta->txq_buffered_tids = 0;
 
-       if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
+       if (!ieee80211_hw_check(&local->hw, AP_LINK_PS))
                drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta);
 
+       if (sta->sta.txq[0]) {
+               for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) {
+                       struct txq_info *txqi = to_txq_info(sta->sta.txq[i]);
+
+                       if (!skb_queue_len(&txqi->queue))
+                               continue;
+
+                       drv_wake_tx_queue(local, txqi);
+               }
+       }
+
        skb_queue_head_init(&pending);
 
+       /* sync with ieee80211_tx_h_unicast_ps_buf */
+       spin_lock(&sta->ps_lock);
        /* Send all buffered frames to the station */
        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
                int count = skb_queue_len(&pending), tmp;
@@ -1063,7 +1202,33 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
                buffered += tmp - count;
        }
 
-       ieee80211_add_pending_skbs_fn(local, &pending, clear_sta_ps_flags, sta);
+       ieee80211_add_pending_skbs(local, &pending);
+
+       /* now we're no longer in the deliver code */
+       clear_sta_flag(sta, WLAN_STA_PS_DELIVER);
+
+       /* The station might have polled and then woken up before we responded,
+        * so clear these flags now to avoid them sticking around.
+        */
+       clear_sta_flag(sta, WLAN_STA_PSPOLL);
+       clear_sta_flag(sta, WLAN_STA_UAPSD);
+       spin_unlock(&sta->ps_lock);
+
+       atomic_dec(&ps->num_sta_ps);
+
+       /* This station just woke up and isn't aware of our SMPS state */
+       if (!ieee80211_vif_is_mesh(&sdata->vif) &&
+           !ieee80211_smps_is_restrictive(sta->known_smps_mode,
+                                          sdata->smps_mode) &&
+           sta->known_smps_mode != sdata->bss->req_smps &&
+           sta_info_tx_streams(sta) != 1) {
+               ht_dbg(sdata,
+                      "%pM just woke up and MIMO capable - update SMPS\n",
+                      sta->sta.addr);
+               ieee80211_send_smps_action(sdata, sdata->bss->req_smps,
+                                          sta->sta.addr,
+                                          sdata->vif.bss_conf.bssid);
+       }
 
        local->total_ps_buffered -= buffered;
 
@@ -1072,18 +1237,21 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
        ps_dbg(sdata,
               "STA %pM aid %d sending %d filtered/%d PS frames since STA not sleeping anymore\n",
               sta->sta.addr, sta->sta.aid, filtered, buffered);
+
+       ieee80211_check_fast_xmit(sta);
 }
 
 static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
                                         struct sta_info *sta, int tid,
-                                        enum ieee80211_frame_release_type reason)
+                                        enum ieee80211_frame_release_type reason,
+                                        bool call_driver)
 {
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_qos_hdr *nullfunc;
        struct sk_buff *skb;
        int size = sizeof(*nullfunc);
        __le16 fc;
-       bool qos = test_sta_flag(sta, WLAN_STA_WME);
+       bool qos = sta->sta.wme;
        struct ieee80211_tx_info *info;
        struct ieee80211_chanctx_conf *chanctx_conf;
 
@@ -1110,6 +1278,7 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
        memcpy(nullfunc->addr1, sta->sta.addr, ETH_ALEN);
        memcpy(nullfunc->addr2, sdata->vif.addr, ETH_ALEN);
        memcpy(nullfunc->addr3, sdata->vif.addr, ETH_ALEN);
+       nullfunc->seq_ctrl = 0;
 
        skb->priority = tid;
        skb_set_queue_mapping(skb, ieee802_1d_to_ac[tid]);
@@ -1133,7 +1302,11 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
                       IEEE80211_TX_STATUS_EOSP |
                       IEEE80211_TX_CTL_REQ_TX_STATUS;
 
-       drv_allow_buffered_frames(local, sta, BIT(tid), 1, reason, false);
+       info->control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE;
+
+       if (call_driver)
+               drv_allow_buffered_frames(local, sta, BIT(tid), 1,
+                                         reason, false);
 
        skb->dev = sdata->dev;
 
@@ -1145,10 +1318,22 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
                return;
        }
 
-       ieee80211_xmit(sdata, skb, chanctx_conf->def.chan->band);
+       info->band = chanctx_conf->def.chan->band;
+       ieee80211_xmit(sdata, sta, skb);
        rcu_read_unlock();
 }
 
+static int find_highest_prio_tid(unsigned long tids)
+{
+       /* lower 3 TIDs aren't ordered perfectly */
+       if (tids & 0xF8)
+               return fls(tids) - 1;
+       /* TID 0 is BE just like TID 3 */
+       if (tids & BIT(0))
+               return 0;
+       return fls(tids) - 1;
+}
+
 static void
 ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                                  int n_frames, u8 ignored_acs,
@@ -1156,7 +1341,6 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
 {
        struct ieee80211_sub_if_data *sdata = sta->sdata;
        struct ieee80211_local *local = sdata->local;
-       bool found = false;
        bool more_data = false;
        int ac;
        unsigned long driver_release_tids = 0;
@@ -1167,9 +1351,7 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
 
        __skb_queue_head_init(&frames);
 
-       /*
-        * Get response frame(s) and more data bit for it.
-        */
+       /* Get response frame(s) and more data bit for the last one. */
        for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
                unsigned long tids;
 
@@ -1178,43 +1360,50 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
 
                tids = ieee80211_tids_for_ac(ac);
 
-               if (!found) {
-                       driver_release_tids = sta->driver_buffered_tids & tids;
-                       if (driver_release_tids) {
-                               found = true;
-                       } else {
-                               struct sk_buff *skb;
-
-                               while (n_frames > 0) {
-                                       skb = skb_dequeue(&sta->tx_filtered[ac]);
-                                       if (!skb) {
-                                               skb = skb_dequeue(
-                                                       &sta->ps_tx_buf[ac]);
-                                               if (skb)
-                                                       local->total_ps_buffered--;
-                                       }
-                                       if (!skb)
-                                               break;
-                                       n_frames--;
-                                       found = true;
-                                       __skb_queue_tail(&frames, skb);
-                               }
-                       }
+               /* if we already have frames from software, then we can't also
+                * release from hardware queues
+                */
+               if (skb_queue_empty(&frames)) {
+                       driver_release_tids |= sta->driver_buffered_tids & tids;
+                       driver_release_tids |= sta->txq_buffered_tids & tids;
+               }
 
-                       /*
-                        * If the driver has data on more than one TID then
+               if (driver_release_tids) {
+                       /* If the driver has data on more than one TID then
                         * certainly there's more data if we release just a
-                        * single frame now (from a single TID).
+                        * single frame now (from a single TID). This will
+                        * only happen for PS-Poll.
                         */
                        if (reason == IEEE80211_FRAME_RELEASE_PSPOLL &&
                            hweight16(driver_release_tids) > 1) {
                                more_data = true;
                                driver_release_tids =
-                                       BIT(ffs(driver_release_tids) - 1);
+                                       BIT(find_highest_prio_tid(
+                                               driver_release_tids));
                                break;
                        }
+               } else {
+                       struct sk_buff *skb;
+
+                       while (n_frames > 0) {
+                               skb = skb_dequeue(&sta->tx_filtered[ac]);
+                               if (!skb) {
+                                       skb = skb_dequeue(
+                                               &sta->ps_tx_buf[ac]);
+                                       if (skb)
+                                               local->total_ps_buffered--;
+                               }
+                               if (!skb)
+                                       break;
+                               n_frames--;
+                               __skb_queue_tail(&frames, skb);
+                       }
                }
 
+               /* If we have more frames buffered on this AC, then set the
+                * more-data bit and abort the loop since we can't send more
+                * data from other ACs before the buffered frames from this.
+                */
                if (!skb_queue_empty(&sta->tx_filtered[ac]) ||
                    !skb_queue_empty(&sta->ps_tx_buf[ac])) {
                        more_data = true;
@@ -1222,7 +1411,7 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                }
        }
 
-       if (!found) {
+       if (skb_queue_empty(&frames) && !driver_release_tids) {
                int tid;
 
                /*
@@ -1243,15 +1432,13 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                /* This will evaluate to 1, 3, 5 or 7. */
                tid = 7 - ((ffs(~ignored_acs) - 1) << 1);
 
-               ieee80211_send_null_response(sdata, sta, tid, reason);
-               return;
-       }
-
-       if (!driver_release_tids) {
+               ieee80211_send_null_response(sdata, sta, tid, reason, true);
+       } else if (!driver_release_tids) {
                struct sk_buff_head pending;
                struct sk_buff *skb;
                int num = 0;
                u16 tids = 0;
+               bool need_null = false;
 
                skb_queue_head_init(&pending);
 
@@ -1268,6 +1455,7 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                         * exchange.
                         */
                        info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
+                       info->control.flags |= IEEE80211_TX_CTRL_PS_RESPONSE;
 
                        /*
                         * Use MoreData flag to indicate whether there are
@@ -1284,22 +1472,57 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                            ieee80211_is_qos_nullfunc(hdr->frame_control))
                                qoshdr = ieee80211_get_qos_ctl(hdr);
 
-                       /* end service period after last frame */
-                       if (skb_queue_empty(&frames)) {
-                               if (reason == IEEE80211_FRAME_RELEASE_UAPSD &&
-                                   qoshdr)
-                                       *qoshdr |= IEEE80211_QOS_CTL_EOSP;
+                       tids |= BIT(skb->priority);
 
+                       __skb_queue_tail(&pending, skb);
+
+                       /* end service period after last frame or add one */
+                       if (!skb_queue_empty(&frames))
+                               continue;
+
+                       if (reason != IEEE80211_FRAME_RELEASE_UAPSD) {
+                               /* for PS-Poll, there's only one frame */
                                info->flags |= IEEE80211_TX_STATUS_EOSP |
                                               IEEE80211_TX_CTL_REQ_TX_STATUS;
+                               break;
                        }
 
-                       if (qoshdr)
-                               tids |= BIT(*qoshdr & IEEE80211_QOS_CTL_TID_MASK);
-                       else
-                               tids |= BIT(0);
+                       /* For uAPSD, things are a bit more complicated. If the
+                        * last frame has a QoS header (i.e. is a QoS-data or
+                        * QoS-nulldata frame) then just set the EOSP bit there
+                        * and be done.
+                        * If the frame doesn't have a QoS header (which means
+                        * it should be a bufferable MMPDU) then we can't set
+                        * the EOSP bit in the QoS header; add a QoS-nulldata
+                        * frame to the list to send it after the MMPDU.
+                        *
+                        * Note that this code is only in the mac80211-release
+                        * code path, we assume that the driver will not buffer
+                        * anything but QoS-data frames, or if it does, will
+                        * create the QoS-nulldata frame by itself if needed.
+                        *
+                        * Cf. 802.11-2012 10.2.1.10 (c).
+                        */
+                       if (qoshdr) {
+                               *qoshdr |= IEEE80211_QOS_CTL_EOSP;
 
-                       __skb_queue_tail(&pending, skb);
+                               info->flags |= IEEE80211_TX_STATUS_EOSP |
+                                              IEEE80211_TX_CTL_REQ_TX_STATUS;
+                       } else {
+                               /* The standard isn't completely clear on this
+                                * as it says the more-data bit should be set
+                                * if there are more BUs. The QoS-Null frame
+                                * we're about to send isn't buffered yet, we
+                                * only create it below, but let's pretend it
+                                * was buffered just in case some clients only
+                                * expect more-data=0 when eosp=1.
+                                */
+                               hdr->frame_control |=
+                                       cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+                               need_null = true;
+                               num++;
+                       }
+                       break;
                }
 
                drv_allow_buffered_frames(local, sta, tids, num,
@@ -1307,17 +1530,25 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
 
                ieee80211_add_pending_skbs(local, &pending);
 
+               if (need_null)
+                       ieee80211_send_null_response(
+                               sdata, sta, find_highest_prio_tid(tids),
+                               reason, false);
+
                sta_info_recalc_tim(sta);
        } else {
+               unsigned long tids = sta->txq_buffered_tids & driver_release_tids;
+               int tid;
+
                /*
                 * We need to release a frame that is buffered somewhere in the
                 * driver ... it'll have to handle that.
-                * Note that, as per the comment above, it'll also have to see
-                * if there is more than just one frame on the specific TID that
-                * we're releasing from, and it needs to set the more-data bit
-                * accordingly if we tell it that there's no more data. If we do
-                * tell it there's more data, then of course the more-data bit
-                * needs to be set anyway.
+                * Note that the driver also has to check the number of frames
+                * on the TIDs we're releasing from - if there are more than
+                * n_frames it has to set the more-data bit (if we didn't ask
+                * it to set it anyway due to other buffered frames); if there
+                * are fewer than n_frames it has to make sure to adjust that
+                * to allow the service period to end properly.
                 */
                drv_release_buffered_frames(local, sta, driver_release_tids,
                                            n_frames, reason, more_data);
@@ -1325,11 +1556,25 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
                /*
                 * Note that we don't recalculate the TIM bit here as it would
                 * most likely have no effect at all unless the driver told us
-                * that the TID became empty before returning here from the
+                * that the TID(s) became empty before returning here from the
                 * release function.
-                * Either way, however, when the driver tells us that the TID
-                * became empty we'll do the TIM recalculation.
+                * Either way, however, when the driver tells us that the TID(s)
+                * became empty or we find that a txq became empty, we'll do the
+                * TIM recalculation.
                 */
+
+               if (!sta->sta.txq[0])
+                       return;
+
+               for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
+                       struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]);
+
+                       if (!(tids & BIT(tid)) || skb_queue_len(&txqi->queue))
+                               continue;
+
+                       sta_info_recalc_tim(sta);
+                       break;
+               }
        }
 }
 
@@ -1375,7 +1620,7 @@ void ieee80211_sta_ps_deliver_uapsd(struct sta_info *sta)
                break;
        case 0:
                /* XXX: what is a good value? */
-               n_frames = 8;
+               n_frames = 128;
                break;
        }
 
@@ -1390,10 +1635,28 @@ void ieee80211_sta_block_awake(struct ieee80211_hw *hw,
 
        trace_api_sta_block_awake(sta->local, pubsta, block);
 
-       if (block)
+       if (block) {
                set_sta_flag(sta, WLAN_STA_PS_DRIVER);
-       else if (test_sta_flag(sta, WLAN_STA_PS_DRIVER))
-               ieee80211_queue_work(hw, &sta->drv_unblock_wk);
+               ieee80211_clear_fast_xmit(sta);
+               return;
+       }
+
+       if (!test_sta_flag(sta, WLAN_STA_PS_DRIVER))
+               return;
+
+       if (!test_sta_flag(sta, WLAN_STA_PS_STA)) {
+               set_sta_flag(sta, WLAN_STA_PS_DELIVER);
+               clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
+               ieee80211_queue_work(hw, &sta->drv_deliver_wk);
+       } else if (test_sta_flag(sta, WLAN_STA_PSPOLL) ||
+                  test_sta_flag(sta, WLAN_STA_UAPSD)) {
+               /* must be asleep in this case */
+               clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
+               ieee80211_queue_work(hw, &sta->drv_deliver_wk);
+       } else {
+               clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
+               ieee80211_check_fast_xmit(sta);
+       }
 }
 EXPORT_SYMBOL(ieee80211_sta_block_awake);
 
@@ -1416,6 +1679,8 @@ void ieee80211_sta_set_buffered(struct ieee80211_sta *pubsta,
        if (WARN_ON(tid >= IEEE80211_NUM_TIDS))
                return;
 
+       trace_api_sta_set_buffered(sta->local, pubsta, tid, buffered);
+
        if (buffered)
                set_bit(tid, &sta->driver_buffered_tids);
        else
@@ -1495,6 +1760,7 @@ int sta_info_move_state(struct sta_info *sta,
                             !sta->sdata->u.vlan.sta))
                                atomic_dec(&sta->sdata->bss->num_mcast_sta);
                        clear_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
+                       ieee80211_clear_fast_xmit(sta);
                }
                break;
        case IEEE80211_STA_AUTHORIZED:
@@ -1504,6 +1770,7 @@ int sta_info_move_state(struct sta_info *sta,
                             !sta->sdata->u.vlan.sta))
                                atomic_inc(&sta->sdata->bss->num_mcast_sta);
                        set_bit(WLAN_STA_AUTHORIZED, &sta->_flags);
+                       ieee80211_check_fast_xmit(sta);
                }
                break;
        default:
@@ -1514,3 +1781,299 @@ int sta_info_move_state(struct sta_info *sta,
 
        return 0;
 }
+
+u8 sta_info_tx_streams(struct sta_info *sta)
+{
+       struct ieee80211_sta_ht_cap *ht_cap = &sta->sta.ht_cap;
+       u8 rx_streams;
+
+       if (!sta->sta.ht_cap.ht_supported)
+               return 1;
+
+       if (sta->sta.vht_cap.vht_supported) {
+               int i;
+               u16 tx_mcs_map =
+                       le16_to_cpu(sta->sta.vht_cap.vht_mcs.tx_mcs_map);
+
+               for (i = 7; i >= 0; i--)
+                       if ((tx_mcs_map & (0x3 << (i * 2))) !=
+                           IEEE80211_VHT_MCS_NOT_SUPPORTED)
+                               return i + 1;
+       }
+
+       if (ht_cap->mcs.rx_mask[3])
+               rx_streams = 4;
+       else if (ht_cap->mcs.rx_mask[2])
+               rx_streams = 3;
+       else if (ht_cap->mcs.rx_mask[1])
+               rx_streams = 2;
+       else
+               rx_streams = 1;
+
+       if (!(ht_cap->mcs.tx_params & IEEE80211_HT_MCS_TX_RX_DIFF))
+               return rx_streams;
+
+       return ((ht_cap->mcs.tx_params & IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)
+                       >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT) + 1;
+}
+
+static void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo)
+{
+       rinfo->flags = 0;
+
+       if (sta->rx_stats.last_rate_flag & RX_FLAG_HT) {
+               rinfo->flags |= RATE_INFO_FLAGS_MCS;
+               rinfo->mcs = sta->rx_stats.last_rate_idx;
+       } else if (sta->rx_stats.last_rate_flag & RX_FLAG_VHT) {
+               rinfo->flags |= RATE_INFO_FLAGS_VHT_MCS;
+               rinfo->nss = sta->rx_stats.last_rate_vht_nss;
+               rinfo->mcs = sta->rx_stats.last_rate_idx;
+       } else {
+               struct ieee80211_supported_band *sband;
+               int shift = ieee80211_vif_get_shift(&sta->sdata->vif);
+               u16 brate;
+
+               sband = sta->local->hw.wiphy->bands[
+                               ieee80211_get_sdata_band(sta->sdata)];
+               brate = sband->bitrates[sta->rx_stats.last_rate_idx].bitrate;
+               rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift);
+       }
+
+       if (sta->rx_stats.last_rate_flag & RX_FLAG_SHORT_GI)
+               rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
+
+       if (sta->rx_stats.last_rate_flag & RX_FLAG_5MHZ)
+               rinfo->bw = RATE_INFO_BW_5;
+       else if (sta->rx_stats.last_rate_flag & RX_FLAG_10MHZ)
+               rinfo->bw = RATE_INFO_BW_10;
+       else if (sta->rx_stats.last_rate_flag & RX_FLAG_40MHZ)
+               rinfo->bw = RATE_INFO_BW_40;
+       else if (sta->rx_stats.last_rate_vht_flag & RX_VHT_FLAG_80MHZ)
+               rinfo->bw = RATE_INFO_BW_80;
+       else if (sta->rx_stats.last_rate_vht_flag & RX_VHT_FLAG_160MHZ)
+               rinfo->bw = RATE_INFO_BW_160;
+       else
+               rinfo->bw = RATE_INFO_BW_20;
+}
+
+void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
+{
+       struct ieee80211_sub_if_data *sdata = sta->sdata;
+       struct ieee80211_local *local = sdata->local;
+       struct rate_control_ref *ref = NULL;
+       u32 thr = 0;
+       int i, ac;
+
+       if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
+               ref = local->rate_ctrl;
+
+       sinfo->generation = sdata->local->sta_generation;
+
+       /* do before driver, so beacon filtering drivers have a
+        * chance to e.g. just add the number of filtered beacons
+        * (or just modify the value entirely, of course)
+        */
+       if (sdata->vif.type == NL80211_IFTYPE_STATION)
+               sinfo->rx_beacon = sdata->u.mgd.count_beacon_signal;
+
+       drv_sta_statistics(local, sdata, &sta->sta, sinfo);
+
+       sinfo->filled |= BIT(NL80211_STA_INFO_INACTIVE_TIME) |
+                        BIT(NL80211_STA_INFO_STA_FLAGS) |
+                        BIT(NL80211_STA_INFO_BSS_PARAM) |
+                        BIT(NL80211_STA_INFO_CONNECTED_TIME) |
+                        BIT(NL80211_STA_INFO_RX_DROP_MISC);
+
+       if (sdata->vif.type == NL80211_IFTYPE_STATION) {
+               sinfo->beacon_loss_count = sdata->u.mgd.beacon_loss_count;
+               sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_LOSS);
+       }
+
+       sinfo->connected_time = ktime_get_seconds() - sta->last_connected;
+       sinfo->inactive_time =
+               jiffies_to_msecs(jiffies - sta->rx_stats.last_rx);
+
+       if (!(sinfo->filled & (BIT(NL80211_STA_INFO_TX_BYTES64) |
+                              BIT(NL80211_STA_INFO_TX_BYTES)))) {
+               sinfo->tx_bytes = 0;
+               for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
+                       sinfo->tx_bytes += sta->tx_stats.bytes[ac];
+               sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64);
+       }
+
+       if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_PACKETS))) {
+               sinfo->tx_packets = 0;
+               for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
+                       sinfo->tx_packets += sta->tx_stats.packets[ac];
+               sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);
+       }
+
+       if (!(sinfo->filled & (BIT(NL80211_STA_INFO_RX_BYTES64) |
+                              BIT(NL80211_STA_INFO_RX_BYTES)))) {
+               sinfo->rx_bytes = sta->rx_stats.bytes;
+               sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64);
+       }
+
+       if (!(sinfo->filled & BIT(NL80211_STA_INFO_RX_PACKETS))) {
+               sinfo->rx_packets = sta->rx_stats.packets;
+               sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);
+       }
+
+       if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_RETRIES))) {
+               sinfo->tx_retries = sta->status_stats.retry_count;
+               sinfo->filled |= BIT(NL80211_STA_INFO_TX_RETRIES);
+       }
+
+       if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_FAILED))) {
+               sinfo->tx_failed = sta->status_stats.retry_failed;
+               sinfo->filled |= BIT(NL80211_STA_INFO_TX_FAILED);
+       }
+
+       sinfo->rx_dropped_misc = sta->rx_stats.dropped;
+
+       if (sdata->vif.type == NL80211_IFTYPE_STATION &&
+           !(sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)) {
+               sinfo->filled |= BIT(NL80211_STA_INFO_BEACON_RX) |
+                                BIT(NL80211_STA_INFO_BEACON_SIGNAL_AVG);
+               sinfo->rx_beacon_signal_avg = ieee80211_ave_rssi(&sdata->vif);
+       }
+
+       if (ieee80211_hw_check(&sta->local->hw, SIGNAL_DBM) ||
+           ieee80211_hw_check(&sta->local->hw, SIGNAL_UNSPEC)) {
+               if (!(sinfo->filled & BIT(NL80211_STA_INFO_SIGNAL))) {
+                       sinfo->signal = (s8)sta->rx_stats.last_signal;
+                       sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
+               }
+
+               if (!(sinfo->filled & BIT(NL80211_STA_INFO_SIGNAL_AVG))) {
+                       sinfo->signal_avg =
+                               -ewma_signal_read(&sta->rx_stats.avg_signal);
+                       sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG);
+               }
+       }
+
+       if (sta->rx_stats.chains &&
+           !(sinfo->filled & (BIT(NL80211_STA_INFO_CHAIN_SIGNAL) |
+                              BIT(NL80211_STA_INFO_CHAIN_SIGNAL_AVG)))) {
+               sinfo->filled |= BIT(NL80211_STA_INFO_CHAIN_SIGNAL) |
+                                BIT(NL80211_STA_INFO_CHAIN_SIGNAL_AVG);
+
+               sinfo->chains = sta->rx_stats.chains;
+               for (i = 0; i < ARRAY_SIZE(sinfo->chain_signal); i++) {
+                       sinfo->chain_signal[i] =
+                               sta->rx_stats.chain_signal_last[i];
+                       sinfo->chain_signal_avg[i] =
+                               -ewma_signal_read(&sta->rx_stats.chain_signal_avg[i]);
+               }
+       }
+
+       if (!(sinfo->filled & BIT(NL80211_STA_INFO_TX_BITRATE))) {
+               sta_set_rate_info_tx(sta, &sta->tx_stats.last_rate,
+                                    &sinfo->txrate);
+               sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
+       }
+
+       if (!(sinfo->filled & BIT(NL80211_STA_INFO_RX_BITRATE))) {
+               sta_set_rate_info_rx(sta, &sinfo->rxrate);
+               sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE);
+       }
+
+       sinfo->filled |= BIT(NL80211_STA_INFO_TID_STATS);
+       for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {
+               struct cfg80211_tid_stats *tidstats = &sinfo->pertid[i];
+
+               if (!(tidstats->filled & BIT(NL80211_TID_STATS_RX_MSDU))) {
+                       tidstats->filled |= BIT(NL80211_TID_STATS_RX_MSDU);
+                       tidstats->rx_msdu = sta->rx_stats.msdu[i];
+               }
+
+               if (!(tidstats->filled & BIT(NL80211_TID_STATS_TX_MSDU))) {
+                       tidstats->filled |= BIT(NL80211_TID_STATS_TX_MSDU);
+                       tidstats->tx_msdu = sta->tx_stats.msdu[i];
+               }
+
+               if (!(tidstats->filled &
+                               BIT(NL80211_TID_STATS_TX_MSDU_RETRIES)) &&
+                   ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) {
+                       tidstats->filled |=
+                               BIT(NL80211_TID_STATS_TX_MSDU_RETRIES);
+                       tidstats->tx_msdu_retries =
+                               sta->status_stats.msdu_retries[i];
+               }
+
+               if (!(tidstats->filled &
+                               BIT(NL80211_TID_STATS_TX_MSDU_FAILED)) &&
+                   ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) {
+                       tidstats->filled |=
+                               BIT(NL80211_TID_STATS_TX_MSDU_FAILED);
+                       tidstats->tx_msdu_failed =
+                               sta->status_stats.msdu_failed[i];
+               }
+       }
+
+       if (ieee80211_vif_is_mesh(&sdata->vif)) {
+#ifdef CONFIG_MAC80211_MESH
+               sinfo->filled |= BIT(NL80211_STA_INFO_LLID) |
+                                BIT(NL80211_STA_INFO_PLID) |
+                                BIT(NL80211_STA_INFO_PLINK_STATE) |
+                                BIT(NL80211_STA_INFO_LOCAL_PM) |
+                                BIT(NL80211_STA_INFO_PEER_PM) |
+                                BIT(NL80211_STA_INFO_NONPEER_PM);
+
+               sinfo->llid = sta->mesh->llid;
+               sinfo->plid = sta->mesh->plid;
+               sinfo->plink_state = sta->mesh->plink_state;
+               if (test_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN)) {
+                       sinfo->filled |= BIT(NL80211_STA_INFO_T_OFFSET);
+                       sinfo->t_offset = sta->mesh->t_offset;
+               }
+               sinfo->local_pm = sta->mesh->local_pm;
+               sinfo->peer_pm = sta->mesh->peer_pm;
+               sinfo->nonpeer_pm = sta->mesh->nonpeer_pm;
+#endif
+       }
+
+       sinfo->bss_param.flags = 0;
+       if (sdata->vif.bss_conf.use_cts_prot)
+               sinfo->bss_param.flags |= BSS_PARAM_FLAGS_CTS_PROT;
+       if (sdata->vif.bss_conf.use_short_preamble)
+               sinfo->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_PREAMBLE;
+       if (sdata->vif.bss_conf.use_short_slot)
+               sinfo->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_SLOT_TIME;
+       sinfo->bss_param.dtim_period = sdata->vif.bss_conf.dtim_period;
+       sinfo->bss_param.beacon_interval = sdata->vif.bss_conf.beacon_int;
+
+       sinfo->sta_flags.set = 0;
+       sinfo->sta_flags.mask = BIT(NL80211_STA_FLAG_AUTHORIZED) |
+                               BIT(NL80211_STA_FLAG_SHORT_PREAMBLE) |
+                               BIT(NL80211_STA_FLAG_WME) |
+                               BIT(NL80211_STA_FLAG_MFP) |
+                               BIT(NL80211_STA_FLAG_AUTHENTICATED) |
+                               BIT(NL80211_STA_FLAG_ASSOCIATED) |
+                               BIT(NL80211_STA_FLAG_TDLS_PEER);
+       if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
+               sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_AUTHORIZED);
+       if (test_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE))
+               sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_SHORT_PREAMBLE);
+       if (sta->sta.wme)
+               sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_WME);
+       if (test_sta_flag(sta, WLAN_STA_MFP))
+               sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_MFP);
+       if (test_sta_flag(sta, WLAN_STA_AUTH))
+               sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_AUTHENTICATED);
+       if (test_sta_flag(sta, WLAN_STA_ASSOC))
+               sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_ASSOCIATED);
+       if (test_sta_flag(sta, WLAN_STA_TDLS_PEER))
+               sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);
+
+       /* check if the driver has a SW RC implementation */
+       if (ref && ref->ops->get_expected_throughput)
+               thr = ref->ops->get_expected_throughput(sta->rate_ctrl_priv);
+       else
+               thr = drv_get_expected_throughput(local, &sta->sta);
+
+       if (thr != 0) {
+               sinfo->filled |= BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT);
+               sinfo->expected_throughput = thr;
+       }
+}