On 10/16/2015 09:34 AM, Arend van Spriel wrote:
Since commit 84b00607aeb8 ("mac80211: use ktime_get_seconds")
mac80211 uses ktime_get_seconds(). This patch provide a backport
using ktime_get_ts() for it.
That commit probably is for 4.4 kernel so guess it needs to be in a
newly created backport-4.4.c, right?
Regards,
Arend
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
---
backport/backport-include/linux/ktime.h | 8 ++++++++
backport/compat/backport-4.3.c | 10 ++++++++++
2 files changed, 18 insertions(+)
diff --git a/backport/backport-include/linux/ktime.h b/backport/backport-include/linux/ktime.h
index 6fbc6c6..2edacf9 100644
--- a/backport/backport-include/linux/ktime.h
+++ b/backport/backport-include/linux/ktime.h
@@ -9,6 +9,14 @@ extern ktime_t ktime_get_raw(void);
#endif /* < 3.17 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
+typedef __s64 time64_t;
+#endif
+#define ktime_get_seconds LINUX_BACKPORT(ktime_get_seconds)
+extern time64_t ktime_get_seconds(void);
+#endif /* < 3.19 */
+
#ifndef ktime_to_timespec64
/* Map the ktime_t to timespec conversion to ns_to_timespec function */
#define ktime_to_timespec64(kt) ns_to_timespec64((kt).tv64)
diff --git a/backport/compat/backport-4.3.c b/backport/compat/backport-4.3.c
index d15c92c..2797944 100644
--- a/backport/compat/backport-4.3.c
+++ b/backport/compat/backport-4.3.c
@@ -11,6 +11,7 @@
#include <linux/seq_file.h>
#include <linux/export.h>
#include <linux/printk.h>
+#include <linux/ktime.h>
static void seq_set_overflow(struct seq_file *m)
{
@@ -57,3 +58,12 @@ void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
}
}
EXPORT_SYMBOL_GPL(seq_hex_dump);
+
+time64_t ktime_get_seconds(void)
+{
+ struct timespec ts;
+
+ ktime_get_ts(&ts);
+ return ts.tv_sec;
+}
+EXPORT_SYMBOL_GPL(ktime_get_seconds);
--
To unsubscribe from this list: send the line "unsubscribe backports" in
