Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 28855a6545fc0ba2521708a4204fc1d10f393716 Author: Antonio Quartulli antonio@meshcoding.com Date: Tue Nov 19 08:26:07 2013 +0100

batman-adv: add compat code for kstrtou32

kstrtou32() does not exist before 2.6.39. Convert it to strict_strtoul() in that case.

Used-by: e29249b4483b91d7a590a16e9b5ffe9412ce7fde ("batman-adv: add isolation_mark sysfs attribute")

Signed-off-by: Antonio Quartulli antonio@meshcoding.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

28855a6545fc0ba2521708a4204fc1d10f393716 compat.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/compat.h b/compat.h index 01984b8..682da28 100644 --- a/compat.h +++ b/compat.h @@ -152,6 +152,8 @@ static inline int batadv_param_set_copystring(const char *val,

#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)

+/* cast last argument of strict_strtoul() because we have a uint32_t */ +#define kstrtou32(cp, base, v) strict_strtoul(cp, base, (unsigned long *)v) #define kstrtoul strict_strtoul #define kstrtol strict_strtol