diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-01 15:39:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-01 15:39:56 -0500 |
| commit | ad86c55bac643a745f480d26689d153ec0f38b04 (patch) | |
| tree | 8ae3e20d2f3619021393166fe1f50a8ca00c1c33 /net/mac80211/pm.c | |
| parent | 21eb218989523b7bee28900aaec9f9296b70fa27 (diff) | |
| parent | 39731b78b4afebb7501c05b68e2443a1b250b41c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/pm.c')
| -rw-r--r-- | net/mac80211/pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 340126204343..af64fb8e8add 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c | |||
| @@ -37,9 +37,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) | |||
| 37 | IEEE80211_MAX_QUEUE_MAP, | 37 | IEEE80211_MAX_QUEUE_MAP, |
| 38 | IEEE80211_QUEUE_STOP_REASON_SUSPEND); | 38 | IEEE80211_QUEUE_STOP_REASON_SUSPEND); |
| 39 | 39 | ||
| 40 | /* flush out all packets and station cleanup call_rcu()s */ | 40 | /* flush out all packets */ |
| 41 | synchronize_net(); | 41 | synchronize_net(); |
| 42 | rcu_barrier(); | ||
| 43 | 42 | ||
| 44 | ieee80211_flush_queues(local, NULL); | 43 | ieee80211_flush_queues(local, NULL); |
| 45 | 44 | ||