diff options
| author | Sujith Manoharan | 2014-10-02 03:03:13 +0200 |
|---|---|---|
| committer | John W. Linville | 2014-10-02 20:26:31 +0200 |
| commit | b736728575af03488388e84fceac7bf0eac5dbb6 (patch) | |
| tree | b570e91c102158035119781a3b8ed6d2da4410fa /drivers/net | |
| parent | ath9k: Print RoC expiration (diff) | |
| download | kernel-qcow2-linux-b736728575af03488388e84fceac7bf0eac5dbb6.tar.gz kernel-qcow2-linux-b736728575af03488388e84fceac7bf0eac5dbb6.tar.xz kernel-qcow2-linux-b736728575af03488388e84fceac7bf0eac5dbb6.zip | |
ath9k: Check pending frames properly
There is no need to check if the current
channel context has active ACs queued up
if the TX queue is not empty.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 32f9db9bd53c..4466de0740f9 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -60,8 +60,10 @@ static bool ath9k_has_pending_frames(struct ath_softc *sc, struct ath_txq *txq) spin_lock_bh(&txq->axq_lock); - if (txq->axq_depth) + if (txq->axq_depth) { pending = true; + goto out; + } if (txq->mac80211_qnum >= 0) { struct list_head *list; @@ -70,6 +72,7 @@ static bool ath9k_has_pending_frames(struct ath_softc *sc, struct ath_txq *txq) if (!list_empty(list)) pending = true; } +out: spin_unlock_bh(&txq->axq_lock); return pending; } |