summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-07-25 10:22:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-07-25 10:22:36 -0400
commit9a244409d0b0cf3b1e46f1dc331f2c718597fae0 (patch)
tree5d5aa1964a1f97cb978a33b3533134ee624f90b6 /net/mac80211/sta_info.c
parentbac9832076ee3b134bc859e07698c99276fc9459 (diff)
parentc01fac1c77a00227f706a1654317023e3f4ac7f0 (diff)
downloadop-kernel-dev-9a244409d0b0cf3b1e46f1dc331f2c718597fae0.zip
op-kernel-dev-9a244409d0b0cf3b1e46f1dc331f2c718597fae0.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: net/mac80211/cfg.c Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index f41177f..c6ee213 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1724,12 +1724,15 @@ 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 |
OpenPOWER on IntegriCloud