Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlegacy / common.c

diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 5d4807c2b56d80aaafe47089a2498b29856ba40c..0f8a7703eea3c493486bc09b049a77f6a89a7a9b 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/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;
        }