diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-04-17 11:26:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-07 20:33:04 -0700 |
| commit | 1c407b93add6c626075227db19bee97111fc6d6e (patch) | |
| tree | c903cbbb5a012ce4bc08229a0174e90a4f6773e6 /net | |
| parent | 0ad7bdc51c7b2189eee5083a15e8099d7f25f434 (diff) | |
mac80211: fix station entry leak/warning while suspending
commit b20d34c458bc2bbd0a4624f2933581e01e72d875 upstream.
Since Stanislaw's patches, when suspending while connected,
cfg80211 will disconnect. This causes the AP station to be
removed, which uses call_rcu() to clean up. Due to needing
process context, this queues a work struct on the mac80211
workqueue. This will warn and fail when already suspended,
which can happen if the rcu call doesn't happen quickly.
To fix this, replace the synchronize_net() which is really
just synchronize_rcu_expedited() with rcu_barrier(), which
unlike synchronize_rcu() waits until RCU callback have run
and thus avoids this issue.
In theory, this can even happen without Stanislaw's change
to disconnect on suspend since userspace might disconnect
just before suspending, though then it's unlikely that the
call_rcu() will be delayed long enough.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index d0275f34bf7..a2f4655c188 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -53,8 +53,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) ieee80211_stop_queues_by_reason(hw, IEEE80211_QUEUE_STOP_REASON_SUSPEND); - /* flush out all packets */ - synchronize_net(); + /* flush out all packets and station cleanup call_rcu()s */ + rcu_barrier(); drv_flush(local, false); |