From ab1520286199509f597d5efe83b13e63a3360600 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Wed, 27 Jun 2012 10:36:27 +0200 Subject: [PATCH] --- yaml --- r: 314919 b: refs/heads/master c: 26b6da6b7829dc7cf5d21e854564be90c7928323 h: refs/heads/master i: 314917: d9660d4ada9f169afeee15c870925658a75a7f6e 314915: e8aed07d8d85b2e36dd973bd07a167454cf4fe6d 314911: 00893ec637bb4c7942f3511494ff34c19470e1fb v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/common.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 30750b64dc14..19cab24298a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf52592fe4901f486a5266fd73e4ee80205b18b4 +refs/heads/master: 26b6da6b7829dc7cf5d21e854564be90c7928323 diff --git a/trunk/drivers/net/wireless/iwlegacy/common.c b/trunk/drivers/net/wireless/iwlegacy/common.c index cbf2dc18341f..763c7529921b 100644 --- a/trunk/drivers/net/wireless/iwlegacy/common.c +++ b/trunk/drivers/net/wireless/iwlegacy/common.c @@ -4717,10 +4717,11 @@ 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; } @@ -4728,9 +4729,9 @@ il_check_stuck_queue(struct il_priv *il, int cnt) 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; }