[PATCH 1/2] batman-adv: compat: Add support for linux/kstrtox.h

[PATCH 1/2] batman-adv: compat: Add support for linux/kstrtox.h

[Sven Eckelmann]

The commit 4c52729377ea ("kernel.h: split out kstrtox() and simple_strtox()
to a separate header") moved the kstrtou64 function to a new header called
linux/kstrtox.h.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 compat-include/linux/kstrtox.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 compat-include/linux/kstrtox.h

diff --git a/compat-include/linux/kstrtox.h b/compat-include/linux/kstrtox.h
new file mode 100644
index 00000000..cd152e4b
--- /dev/null
+++ b/compat-include/linux/kstrtox.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
+#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_
+#define _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_
+
+#include <linux/version.h>
+#if LINUX_VERSION_IS_GEQ(5, 14, 0)
+#include_next <linux/kstrtox.h>
+#else
+#include <linux/kernel.h>
+#endif
+
+#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_ */
-- 
2.30.2

[PATCH 2/2] batman-adv: Switch to kstrtox.h for kstrtou64

[Sven Eckelmann]

The commit 4c52729377ea ("kernel.h: split out kstrtox() and simple_strtox()
to a separate header") moved the kstrtou64 function to a new header called
linux/kstrtox.h.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 net/batman-adv/gateway_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index fdde305a..9349c76f 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -10,7 +10,7 @@
 #include <linux/atomic.h>
 #include <linux/byteorder/generic.h>
 #include <linux/errno.h>
-#include <linux/kernel.h>
+#include <linux/kstrtox.h>
 #include <linux/limits.h>
 #include <linux/math64.h>
 #include <linux/netdevice.h>
-- 
2.30.2