diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-10-01 21:03:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-10-02 14:26:31 -0400 |
commit | b736728575af03488388e84fceac7bf0eac5dbb6 (patch) | |
tree | b570e91c102158035119781a3b8ed6d2da4410fa | |
parent | 4b60af4ab4363bd79eeba94bb6bed396cf2aaf62 (diff) |
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>
-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) | |||
60 | 60 | ||
61 | spin_lock_bh(&txq->axq_lock); | 61 | spin_lock_bh(&txq->axq_lock); |
62 | 62 | ||
63 | if (txq->axq_depth) | 63 | if (txq->axq_depth) { |
64 | pending = true; | 64 | pending = true; |
65 | goto out; | ||
66 | } | ||
65 | 67 | ||
66 | if (txq->mac80211_qnum >= 0) { | 68 | if (txq->mac80211_qnum >= 0) { |
67 | struct list_head *list; | 69 | struct list_head *list; |
@@ -70,6 +72,7 @@ static bool ath9k_has_pending_frames(struct ath_softc *sc, struct ath_txq *txq) | |||
70 | if (!list_empty(list)) | 72 | if (!list_empty(list)) |
71 | pending = true; | 73 | pending = true; |
72 | } | 74 | } |
75 | out: | ||
73 | spin_unlock_bh(&txq->axq_lock); | 76 | spin_unlock_bh(&txq->axq_lock); |
74 | return pending; | 77 | return pending; |
75 | } | 78 | } |