diff options
| author | Michal Kazior <michal.kazior@tieto.com> | 2016-03-17 10:51:04 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2016-03-21 18:29:16 +0200 |
| commit | 9d71d47eed20f34620e54e29bcc90f959d5873b8 (patch) | |
| tree | 1ea5284de2cd3ad950a6c415f922e8398ff4ecad /drivers | |
| parent | bf031bc4d6a168029b8a640373fd00837746b47d (diff) | |
| download | linux-stable-9d71d47eed20f34620e54e29bcc90f959d5873b8.tar.gz linux-stable-9d71d47eed20f34620e54e29bcc90f959d5873b8.tar.bz2 linux-stable-9d71d47eed20f34620e54e29bcc90f959d5873b8.zip | |
ath10k: fix tx hang
The wake_tx_queue/push_pending logic had a bug
which could stop queues indefinitely effectivelly
breaking traffic.
Fixes: 299468782d94 ("ath10k: implement wake_tx_queue")
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index eedfe821700b..1bc4bf1916a6 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3777,13 +3777,13 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) } list_del_init(&artxq->list); + if (ret != -ENOENT) + list_add_tail(&artxq->list, &ar->txqs); + ath10k_htt_tx_txq_update(hw, txq); - if (artxq == last || (ret < 0 && ret != -ENOENT)) { - if (ret != -ENOENT) - list_add_tail(&artxq->list, &ar->txqs); + if (artxq == last || (ret < 0 && ret != -ENOENT)) break; - } } rcu_read_unlock(); |