diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-10-07 20:48:29 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-07 20:48:29 +0200 |
| commit | d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3 (patch) | |
| tree | 76c1fe931f6b1e6e9f29d25d887791f00d6b6ed7 /net/mac80211 | |
| parent | rtlwifi: Fix static checker warnings for various drivers (diff) | |
| parent | brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels() (diff) | |
| download | linux-d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3.tar.xz linux-d7ffd588f00ef2d9d0f3acc569ddbaebe5c4f8c3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 90395c6b9757..de494df3bab8 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1823,7 +1823,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; |