From 36ab47eeaae83e719b1b4bce592c4fd56457530b Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Mon, 21 Nov 2011 17:32:06 -0500 Subject: [PATCH] --- yaml --- r: 278383 b: refs/heads/master c: 4eb287a4048e4a2cb0400a6d972d97739ec8c799 h: refs/heads/master i: 278381: fe0db8506f99a7125a4ee1d0e81e90e23ed24018 278379: e6c488a1f23732c2d2d51ca5145e6da7c9fab419 278375: 79641d7ba542b8180cfa3c72235566ff9cbc5194 278367: bac5fa4b9394285015ef95113ece9a87dc3d87e9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/xmit.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c8e4ec994918..8d7c494f1084 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f724828bd3db7e0fe6f17ed8de2656bfbfed5c4e +refs/heads/master: 4eb287a4048e4a2cb0400a6d972d97739ec8c799 diff --git a/trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath/ath9k/xmit.c index 55d077e7135d..80639e3e4ac9 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/xmit.c +++ b/trunk/drivers/net/wireless/ath/ath9k/xmit.c @@ -179,6 +179,11 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid) spin_lock_bh(&txq->axq_lock); } + if (tid->baw_head == tid->baw_tail) { + tid->state &= ~AGGR_ADDBA_COMPLETE; + tid->state &= ~AGGR_CLEANUP; + } + spin_unlock_bh(&txq->axq_lock); } @@ -556,15 +561,9 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, spin_unlock_bh(&txq->axq_lock); } - if (tid->state & AGGR_CLEANUP) { + if (tid->state & AGGR_CLEANUP) ath_tx_flush_tid(sc, tid); - if (tid->baw_head == tid->baw_tail) { - tid->state &= ~AGGR_ADDBA_COMPLETE; - tid->state &= ~AGGR_CLEANUP; - } - } - rcu_read_unlock(); if (needreset) {