Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351747
b: refs/heads/master
c: 75de911
h: refs/heads/master
i:
  351745: 83c69b4
  351743: b06b4f0
v: v3
  • Loading branch information
Johannes Berg committed Jan 3, 2013
1 parent a494345 commit 9bbd6e1
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 361c9c8b0eeeec7d881e018d5143bf883558c566
refs/heads/master: 75de9113bb9dc4939a7cd54e4bdfad555b35f5b1
9 changes: 7 additions & 2 deletions trunk/net/mac80211/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1010,8 +1010,13 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
kfree_rcu(old_probe_resp, rcu_head);

list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
sta_info_flush(vlan);
sta_info_flush(sdata);
sta_info_flush_defer(vlan);
sta_info_flush_defer(sdata);
rcu_barrier();
list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
sta_info_flush_cleanup(vlan);
sta_info_flush_cleanup(sdata);

ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);

drv_stop_ap(sdata->local, sdata);
Expand Down
13 changes: 8 additions & 5 deletions trunk/net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -863,12 +863,15 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
cancel_work_sync(&sdata->work);
/*
* When we get here, the interface is marked down.
* sta_info_flush_cleanup() calls rcu_barrier to
* wait for the station call_rcu() calls to complete,
* here we require it to wait for the RX path in case
* it is using the interface and enqueuing frames at
* this very time on another CPU.
*
* sta_info_flush_cleanup() requires rcu_barrier()
* first to wait for the station call_rcu() calls
* to complete, here we need at least sychronize_rcu()
* it to wait for the RX path in case it is using the
* interface and enqueuing frames at this very time on
* another CPU.
*/
rcu_barrier();
sta_info_flush_cleanup(sdata);

skb_queue_purge(&sdata->skb_queue);
Expand Down
2 changes: 0 additions & 2 deletions trunk/net/mac80211/sta_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -920,8 +920,6 @@ int sta_info_flush_defer(struct ieee80211_sub_if_data *sdata)

void sta_info_flush_cleanup(struct ieee80211_sub_if_data *sdata)
{
rcu_barrier();

ieee80211_cleanup_sdata_stas(sdata);
cancel_work_sync(&sdata->cleanup_stations_wk);
}
Expand Down
14 changes: 14 additions & 0 deletions trunk/net/mac80211/sta_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,19 @@ void sta_info_recalc_tim(struct sta_info *sta);
void sta_info_init(struct ieee80211_local *local);
void sta_info_stop(struct ieee80211_local *local);
int sta_info_flush_defer(struct ieee80211_sub_if_data *sdata);

/**
* sta_info_flush_cleanup - flush the sta_info cleanup queue
* @sdata: the interface
*
* Flushes the sta_info cleanup queue for a given interface;
* this is necessary before the interface is removed or, for
* AP/mesh interfaces, before it is deconfigured.
*
* Note an rcu_barrier() must precede the function, after all
* stations have been flushed/removed to ensure the call_rcu()
* calls that add stations to the cleanup queue have completed.
*/
void sta_info_flush_cleanup(struct ieee80211_sub_if_data *sdata);

/**
Expand All @@ -562,6 +575,7 @@ static inline int sta_info_flush(struct ieee80211_sub_if_data *sdata)
{
int ret = sta_info_flush_defer(sdata);

rcu_barrier();
sta_info_flush_cleanup(sdata);

return ret;
Expand Down

0 comments on commit 9bbd6e1

Please sign in to comment.