diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-09-03 15:25:04 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2014-09-05 13:41:08 +0200 |
| commit | 785e21a89d77923852869f83ebd2689ec4d5ce54 (patch) | |
| tree | 1e5e985e993e2c2cd38f55d3188de35599daa59a /net | |
| parent | nl80211: clear skb cb before passing to netlink (diff) | |
| download | linux-dev-785e21a89d77923852869f83ebd2689ec4d5ce54.tar.xz linux-dev-785e21a89d77923852869f83ebd2689ec4d5ce54.zip | |
mac80211: use bss_conf->dtim_period instead of conf.ps_dtim_period
sta_set_sinfo is obviously takes data for specific station.
This specific station is attached to a specific virtual
interface. Hence we should use the dtim_period from this
virtual interface rather than the system wide dtim_period.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -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 441875f03750..a1e433b88c66 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; |