diff --git a/[refs] b/[refs] index 758806a63e16..5f406eb34fc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 991fec091061b901e4fdcc8af4fd25d24a5a7bab +refs/heads/master: b20d34c458bc2bbd0a4624f2933581e01e72d875 diff --git a/trunk/net/mac80211/pm.c b/trunk/net/mac80211/pm.c index d1c021b62fe5..4431f0ffe157 100644 --- a/trunk/net/mac80211/pm.c +++ b/trunk/net/mac80211/pm.c @@ -37,8 +37,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) IEEE80211_MAX_QUEUE_MAP, IEEE80211_QUEUE_STOP_REASON_SUSPEND); - /* flush out all packets */ - synchronize_net(); + /* flush out all packets and station cleanup call_rcu()s */ + rcu_barrier(); ieee80211_flush_queues(local, NULL);