Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / net / mac80211 / sta_info.c

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index e3572be..f8d5c25 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1356,20 +1356,6 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 
        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;
 
        sta_info_recalc_tim(sta);
@@ -2169,19 +2155,41 @@ static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo)
        return 0;
 }
 
+static inline u64 sta_get_tidstats_msdu(struct ieee80211_sta_rx_stats *rxstats,
+                                       int tid)
+{
+       unsigned int start;
+       u64 value;
+
+       do {
+               start = u64_stats_fetch_begin(&rxstats->syncp);
+               value = rxstats->msdu[tid];
+       } while (u64_stats_fetch_retry(&rxstats->syncp, start));
+
+       return value;
+}
+
 static void sta_set_tidstats(struct sta_info *sta,
                             struct cfg80211_tid_stats *tidstats,
                             int tid)
 {
        struct ieee80211_local *local = sta->local;
+       int cpu;
 
        if (!(tidstats->filled & BIT(NL80211_TID_STATS_RX_MSDU))) {
-               unsigned int start;
+               if (!ieee80211_hw_check(&local->hw, USES_RSS))
+                       tidstats->rx_msdu +=
+                               sta_get_tidstats_msdu(&sta->rx_stats, tid);
 
-               do {
-                       start = u64_stats_fetch_begin(&sta->rx_stats.syncp);
-                       tidstats->rx_msdu = sta->rx_stats.msdu[tid];
-               } while (u64_stats_fetch_retry(&sta->rx_stats.syncp, start));
+               if (sta->pcpu_rx_stats) {
+                       for_each_possible_cpu(cpu) {
+                               struct ieee80211_sta_rx_stats *cpurxs;
+
+                               cpurxs = per_cpu_ptr(sta->pcpu_rx_stats, cpu);
+                               tidstats->rx_msdu +=
+                                       sta_get_tidstats_msdu(cpurxs, tid);
+                       }
+               }
 
                tidstats->filled |= BIT(NL80211_TID_STATS_RX_MSDU);
        }
@@ -2285,7 +2293,8 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
 
        if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_RX_BYTES64) |
                               BIT_ULL(NL80211_STA_INFO_RX_BYTES)))) {
-               sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats);
+               if (!ieee80211_hw_check(&local->hw, USES_RSS))
+                       sinfo->rx_bytes += sta_get_stats_bytes(&sta->rx_stats);
 
                if (sta->pcpu_rx_stats) {
                        for_each_possible_cpu(cpu) {