---

yaml
---
r: 314919
b: refs/heads/master
c: 26b6da6
h: refs/heads/master
i:
  314917: d9660d4
  314915: e8aed07
  314911: 00893ec
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf52592fe4901f486a5266fd73e4ee80205b18b4
+refs/heads/master: 26b6da6b7829dc7cf5d21e854564be90c7928323

trunk/drivers/net/wireless/iwlegacy/common.c

@@ -4717,20 +4717,21 @@ il_check_stuck_queue(struct il_priv *il, int cnt)
 	struct il_tx_queue *txq = &il->txq[cnt];
 	struct il_queue *q = &txq->q;
 	unsigned long timeout;
+	unsigned long now = jiffies;
 	int ret;
 
 	if (q->read_ptr == q->write_ptr) {
-		txq->time_stamp = jiffies;
+		txq->time_stamp = now;
 		return 0;
 	}
 
 	timeout =
 	    txq->time_stamp +
 	    msecs_to_jiffies(il->cfg->wd_timeout);
 
-	if (time_after(jiffies, timeout)) {
+	if (time_after(now, timeout)) {
 		IL_ERR("Queue %d stuck for %u ms.\n", q->id,
-		       il->cfg->wd_timeout);
+		       jiffies_to_msecs(now - txq->time_stamp));
 		ret = il_force_reset(il, false);
 		return (ret == -EAGAIN) ? 0 : 1;
 	}