From 37dd1494e68d9a59eaac5b6470d771cc4b0d6fc5 Mon Sep 17 00:00:00 2001
From: Dustin Brown <dustinb@codeaurora.org>
Date: Mon, 18 Sep 2017 17:26:23 -0700
Subject: [PATCH] qcacmn: Interpret delayed work interval as milliseconds

The QDF delayed work APIs currently expect delay intervals in terms of
jiffies. Since QDF is OS agnostic, and jiffies are Linux specific,
interpret delay intervals in terms of milliseconds instead. This aligns
the delayed work APIs with the general timer APIs as well.

Change-Id: I9b9300425baa0857c35f63823de2037a954eed1f
CRs-Fixed: 2111987
---
 qdf/inc/qdf_defer.h         | 4 ++--
 qdf/linux/src/i_qdf_defer.h | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qdf/inc/qdf_defer.h b/qdf/inc/qdf_defer.h
index 49ea6acbe3..2fe3088752 100644
--- a/qdf/inc/qdf_defer.h
+++ b/qdf/inc/qdf_defer.h
@@ -173,7 +173,7 @@ qdf_queue_work(qdf_handle_t hdl, qdf_workqueue_t *wqueue, qdf_work_t *work)
  * @hdl: OS handle
  * @wqueue: pointer to workqueue
  * @work: pointer to work
- * @delay: delay interval
+ * @delay: delay interval in milliseconds
  * Return: none
  */
 static inline void qdf_queue_delayed_work(qdf_handle_t hdl,
@@ -223,7 +223,7 @@ static inline void qdf_sched_work(qdf_handle_t hdl, qdf_work_t *work)
  * qdf_sched_delayed_work() - Schedule a delayed task
  * @hdl: OS handle
  * @work: pointer to delayed work
- * @delay: delay interval
+ * @delay: delay interval in milliseconds
  * Return: none
  */
 static inline void qdf_sched_delayed_work(qdf_handle_t hdl,
diff --git a/qdf/linux/src/i_qdf_defer.h b/qdf/linux/src/i_qdf_defer.h
index a8c8919ce5..431bb29e47 100644
--- a/qdf/linux/src/i_qdf_defer.h
+++ b/qdf/linux/src/i_qdf_defer.h
@@ -141,7 +141,7 @@ static inline void __qdf_queue_delayed_work(qdf_handle_t hdl,
 					    __qdf_delayed_work_t *work,
 					    uint32_t delay)
 {
-	queue_delayed_work(wqueue, work, delay);
+	queue_delayed_work(wqueue, work, msecs_to_jiffies(delay));
 }
 
 /**
@@ -167,7 +167,7 @@ static inline QDF_STATUS __qdf_sched_delayed_work(qdf_handle_t hdl,
 						  __qdf_delayed_work_t *work,
 						  uint32_t delay)
 {
-	schedule_delayed_work(work, delay);
+	schedule_delayed_work(work, msecs_to_jiffies(delay));
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -254,7 +254,7 @@ static inline void __qdf_queue_delayed_work(qdf_handle_t hdl,
 					    __qdf_delayed_work_t *work,
 					    uint32_t delay)
 {
-	queue_delayed_work(wqueue, &work->dwork, delay);
+	queue_delayed_work(wqueue, &work->dwork, msecs_to_jiffies(delay));
 }
 
 static inline QDF_STATUS __qdf_sched_work(qdf_handle_t hdl, __qdf_work_t *work)
@@ -267,7 +267,7 @@ static inline QDF_STATUS __qdf_sched_delayed_work(qdf_handle_t hdl,
 						  __qdf_delayed_work_t *work,
 						  uint32_t delay)
 {
-	schedule_delayed_work(&work->dwork, delay);
+	schedule_delayed_work(&work->dwork, msecs_to_jiffies(delay));
 	return QDF_STATUS_SUCCESS;
 }