summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-09-09 14:29:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-09-09 14:29:36 -0400
commitab09b95cbfecc3c9dd45268176f6fd13beb75bcb (patch)
tree4e251dcb8e4e632d113f998abe0cb2405f3e5e1b /net/mac80211
parent1bd3fa7b8c9b2936c16c6e6452f9cc991c405872 (diff)
parent785e21a89d77923852869f83ebd2689ec4d5ce54 (diff)
downloadop-kernel-dev-ab09b95cbfecc3c9dd45268176f6fd13beb75bcb.zip
op-kernel-dev-ab09b95cbfecc3c9dd45268176f6fd13beb75bcb.tar.gz
Merge tag 'mac80211-for-john-2014-09-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg <johannes@sipsolutions.net> says: "Two more fixes for mac80211 - one of them addresses a long-standing issue that we only found when using vendor events more frequently; the other addresses some bad information being reported in userspace that people were starting to actually look at." Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/sta_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 441875f..a1e433b 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -1822,7 +1822,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
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->local->hw.conf.ps_dtim_period;
+ 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;
OpenPOWER on IntegriCloud