Repository : ssh://git@diktynna/batman-adv

On branch : master

commit 9c16e79d976b64c2fe78c4f76d3a15165db8be8a Author: Sven Eckelmann sven@narfation.org Date: Fri Jul 23 19:23:16 2021 +0200

batman-adv: compat: Add support for linux/kstrtox.h

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

9c16e79d976b64c2fe78c4f76d3a15165db8be8a compat-include/linux/{minmax.h => kstrtox.h} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compat-include/linux/minmax.h b/compat-include/linux/kstrtox.h similarity index 58% copy from compat-include/linux/minmax.h copy to compat-include/linux/kstrtox.h index 9b7269e8..cd152e4b 100644 --- a/compat-include/linux/minmax.h +++ b/compat-include/linux/kstrtox.h @@ -7,14 +7,14 @@ * of the Linux kernel. */

-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ +#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, 10, 0) -#include_next <linux/minmax.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_MINMAX_H_ */ +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_KSTRTOX_H_ */