From 0011adccd10a0370ca175e8565074803c2bbcc59 Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Mon, 5 Nov 2012 10:27:52 +0200 Subject: [PATCH] --- yaml --- r: 335767 b: refs/heads/master c: 987c285c2ae2e4e32aca3a9b3252d28171c75711 h: refs/heads/master i: 335765: 0abd53a3f696b05ca2f28145c5a7800476197372 335763: a2d35c09193271f011d08c9bc52a141231a90f46 335759: 02fae62c2d6a851f07e099b070100e3f514b5e88 v: v3 --- [refs] | 2 +- trunk/net/mac80211/sta_info.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bdcb821943f1..496c25817665 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bca1e29fb54c51856dda6772d488d41b10ed91da +refs/heads/master: 987c285c2ae2e4e32aca3a9b3252d28171c75711 diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c index 797dd36a220d..89ccd3ec7eb8 100644 --- a/trunk/net/mac80211/sta_info.c +++ b/trunk/net/mac80211/sta_info.c @@ -961,6 +961,7 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) struct ieee80211_local *local = sdata->local; struct sk_buff_head pending; int filtered = 0, buffered = 0, ac; + unsigned long flags; clear_sta_flag(sta, WLAN_STA_SP); @@ -976,12 +977,16 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { int count = skb_queue_len(&pending), tmp; + spin_lock_irqsave(&sta->tx_filtered[ac].lock, flags); skb_queue_splice_tail_init(&sta->tx_filtered[ac], &pending); + spin_unlock_irqrestore(&sta->tx_filtered[ac].lock, flags); tmp = skb_queue_len(&pending); filtered += tmp - count; count = tmp; + spin_lock_irqsave(&sta->ps_tx_buf[ac].lock, flags); skb_queue_splice_tail_init(&sta->ps_tx_buf[ac], &pending); + spin_unlock_irqrestore(&sta->ps_tx_buf[ac].lock, flags); tmp = skb_queue_len(&pending); buffered += tmp - count; }