aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-02-19 19:36:16 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:26 -0500
commitd2259243a19894eee06c16e278adfea81dc42bd9 (patch)
tree0e9b2c27151c6d67f789f71b7bef0bfceafb2a95 /net/mac80211/sta_info.c
parent013b73faff107e56cbe75fe4b881f5d80a8cf022 (diff)
mac80211: invoke set_tim() callback after setting own TIM info
Drivers should be allowed to simply get a complete new beacon when set_tim() is invoked (and set_tim() is required for drivers that just want a beacon template!), so we need to update our own TIM bitmap before calling set_tim() so that getting the beacon will now get an already updated beacon. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 746bbdea6b4c..cbe00979e444 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -396,11 +396,11 @@ void sta_info_remove_aid_ptr(struct sta_info *sta)
396 396
397 sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev); 397 sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
398 398
399 if (sdata->bss)
400 __bss_tim_clear(sdata->bss, sta->aid);
399 if (sdata->local->ops->set_tim) 401 if (sdata->local->ops->set_tim)
400 sdata->local->ops->set_tim(local_to_hw(sdata->local), 402 sdata->local->ops->set_tim(local_to_hw(sdata->local),
401 sta->aid, 0); 403 sta->aid, 0);
402 if (sdata->bss)
403 __bss_tim_clear(sdata->bss, sta->aid);
404} 404}
405 405
406 406