mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
iwlegacy: always monitor for stuck queues
This is iwlegacy version of:
commit 342bbf3fee
Author: Johannes Berg <johannes.berg@intel.com>
Date: Sun Mar 4 08:50:46 2012 -0800
iwlwifi: always monitor for stuck queues
If we only monitor while associated, the following
can happen:
- we're associated, and the queue stuck check
runs, setting the queue "touch" time to X
- we disassociate, stopping the monitoring,
which leaves the time set to X
- almost 2s later, we associate, and enqueue
a frame
- before the frame is transmitted, we monitor
for stuck queues, and find the time set to
X, although it is now later than X + 2000ms,
so we decide that the queue is stuck and
erroneously restart the device
Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
efd821182c
commit
c2ca7d92ed
1 changed files with 6 additions and 8 deletions
|
@ -4767,14 +4767,12 @@ il_bg_watchdog(unsigned long data)
|
|||
return;
|
||||
|
||||
/* monitor and check for other stuck queues */
|
||||
if (il_is_any_associated(il)) {
|
||||
for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
|
||||
/* skip as we already checked the command queue */
|
||||
if (cnt == il->cmd_queue)
|
||||
continue;
|
||||
if (il_check_stuck_queue(il, cnt))
|
||||
return;
|
||||
}
|
||||
for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) {
|
||||
/* skip as we already checked the command queue */
|
||||
if (cnt == il->cmd_queue)
|
||||
continue;
|
||||
if (il_check_stuck_queue(il, cnt))
|
||||
return;
|
||||
}
|
||||
|
||||
mod_timer(&il->watchdog,
|
||||
|
|
Loading…
Reference in a new issue