Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/…

…git/jberg/mac80211
git-mirror · Jul 23, 2014 · 3b8de07 · 3b8de07
2 parents 0eeb315 + fa8f136
commit 3b8de07
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
@@ -472,12 +472,15 @@ static 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 = local->rate_ctrl;
+	struct rate_control_ref *ref = NULL;
 	struct timespec uptime;
 	u64 packets = 0;
 	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;
 
 	sinfo->filled = STATION_INFO_INACTIVE_TIME |