From bc1c547b8e944ee7a5088a3f98db5ca8cceb7cb4 Mon Sep 17 00:00:00 2001
From: Kiran Venkatappa <kiranv@codeaurora.org>
Date: Tue, 24 Apr 2018 18:09:09 +0530
Subject: [PATCH] qcacmn: Add timekeeping.h inclusion under correct kernel
 version

timekeeping.h is available from kernel version 3.17. Add header
inclusion and ktime_get_boot_ns call under correct version check flag.

Change-Id: I2a1a127e1716b52af56d14c39e2e646e34b05fa3
CRs-Fixed: 2230949
---
 qdf/inc/qdf_time.h         | 12 ++----------
 qdf/linux/src/i_qdf_time.h | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/qdf/inc/qdf_time.h b/qdf/inc/qdf_time.h
index 60051919e8..ae67ffd92d 100644
--- a/qdf/inc/qdf_time.h
+++ b/qdf/inc/qdf_time.h
@@ -168,19 +168,11 @@ static inline qdf_time_t qdf_get_system_uptime(void)
  * The time since system booted in nanoseconds
  */
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 10, 0))
-static inline s64 qdf_get_bootbased_boottime_ns(void)
+static inline uint64_t qdf_get_bootbased_boottime_ns(void)
 {
-	return ktime_get_boot_ns();
+	return __qdf_get_bootbased_boottime_ns();
 }
 
-#else
-static inline s64 qdf_get_bootbased_boottime_ns(void)
-{
-	return ktime_to_ns(ktime_get_boottime());
-}
-#endif
-
 /**
  * qdf_get_system_timestamp - Return current timestamp
  *
diff --git a/qdf/linux/src/i_qdf_time.h b/qdf/linux/src/i_qdf_time.h
index 2352a9daec..4080f26155 100644
--- a/qdf/linux/src/i_qdf_time.h
+++ b/qdf/linux/src/i_qdf_time.h
@@ -36,7 +36,9 @@
 #include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/ktime.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
 #include <linux/timekeeping.h>
+#endif
 #ifdef MSM_PLATFORM
 #include <asm/arch_timer.h>
 #endif
@@ -305,4 +307,28 @@ static inline uint64_t __qdf_get_log_timestamp(void)
 }
 #endif /* QCA_WIFI_3_0_ADRASTEA */
 
+/**
+ * __qdf_get_bootbased_boottime_ns() - Get the bootbased time in nanoseconds
+ *
+ * __qdf_get_bootbased_boottime_ns() function returns the number of nanoseconds
+ * that have elapsed since the system was booted. It also includes the time when
+ * system was suspended.
+ *
+ * Return:
+ * The time since system booted in nanoseconds
+ */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
+static inline uint64_t __qdf_get_bootbased_boottime_ns(void)
+{
+	return ktime_get_boot_ns();
+}
+
+#else
+static inline uint64_t __qdf_get_bootbased_boottime_ns(void)
+{
+	return ktime_to_ns(ktime_get_boottime());
+}
+#endif
+
 #endif