diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-09-24 14:34:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-24 14:34:40 -0400 |
commit | 9b4e9e756541fd5d1223b323ed5a8a8545dd11cd (patch) | |
tree | 3eed3a2582532bd1fd890b58eadd472fcd2b1dc7 /net/mac80211/iface.c | |
parent | 7a5f799becc51c842ec1a3aeb8dd82651aea7036 (diff) | |
parent | 9385d04f2872057a2029901190391fe192b18693 (diff) | |
download | op-kernel-dev-9b4e9e756541fd5d1223b323ed5a8a8545dd11cd.zip op-kernel-dev-9b4e9e756541fd5d1223b323ed5a8a8545dd11cd.tar.gz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index d747da5..6f8a73c 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -793,11 +793,20 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, flush_work(&sdata->work); /* * When we get here, the interface is marked down. - * Call synchronize_rcu() to wait for the RX path + * Call rcu_barrier() to wait both for the RX path * should it be using the interface and enqueuing - * frames at this very time on another CPU. + * frames at this very time on another CPU, and + * for the sta free call_rcu callbacks. */ - synchronize_rcu(); + rcu_barrier(); + + /* + * free_sta_rcu() enqueues a work for the actual + * sta cleanup, so we need to flush it while + * sdata is still valid. + */ + flush_workqueue(local->workqueue); + skb_queue_purge(&sdata->skb_queue); /* |