Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[uclinux-h8/linux.git] / net / mac80211 / sta_info.c

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index fb8c225..c4a8f11 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2253,11 +2253,8 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
        }
 
        if (tidstats && !cfg80211_sinfo_alloc_tid_stats(sinfo, GFP_KERNEL)) {
-               for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {
-                       struct cfg80211_tid_stats *tidstats = &sinfo->pertid[i];
-
-                       sta_set_tidstats(sta, tidstats, i);
-               }
+               for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++)
+                       sta_set_tidstats(sta, &sinfo->pertid[i], i);
        }
 
        if (ieee80211_vif_is_mesh(&sdata->vif)) {
@@ -2267,7 +2264,8 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
                                 BIT_ULL(NL80211_STA_INFO_PLINK_STATE) |
                                 BIT_ULL(NL80211_STA_INFO_LOCAL_PM) |
                                 BIT_ULL(NL80211_STA_INFO_PEER_PM) |
-                                BIT_ULL(NL80211_STA_INFO_NONPEER_PM);
+                                BIT_ULL(NL80211_STA_INFO_NONPEER_PM) |
+                                BIT_ULL(NL80211_STA_INFO_CONNECTED_TO_GATE);
 
                sinfo->llid = sta->mesh->llid;
                sinfo->plid = sta->mesh->plid;
@@ -2279,6 +2277,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
                sinfo->local_pm = sta->mesh->local_pm;
                sinfo->peer_pm = sta->mesh->peer_pm;
                sinfo->nonpeer_pm = sta->mesh->nonpeer_pm;
+               sinfo->connected_to_gate = sta->mesh->connected_to_gate;
 #endif
        }