From 5bd07eb12b57059061f85a19d3fd23004572580d Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 13 Dec 2019 21:52:25 +0100 Subject: [PATCH] batman-adv: upgrade package to latest release 2019.5 * support latest kernels (3.16 - 5.5) * coding style cleanups and refactoring * bugs squashed: - fix DAT candidate selection on little endian systems Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 4 ++-- batman-adv/src/compat-hacks.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index c59ebce..ed3e1c2 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2019.4 +PKG_VERSION:=2019.5 PKG_RELEASE:=0 -PKG_HASH:=de07be3f46dddadc3f9608ca11814ecae534c65ccd7cbfeb9762f8e90a17f660 +PKG_HASH:=29fd11b07842f40fee1782bf7ea512278fc4e483bac3c52cf74f8af0f6fe28ec PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 9dd4597..2085767 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -118,6 +118,18 @@ static inline int batadv_access_ok(int type, const void __user *p, #endif /* < KERNEL_VERSION(5, 0, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) + +#ifndef fallthrough +#if __GNUC__ > 7 && !defined(__CHECKER__) +# define fallthrough __attribute__((__fallthrough__)) +#else +# define fallthrough do {} while (0) /* fallthrough */ +#endif +#endif + +#endif /* < KERNEL_VERSION(5, 4, 0) */ + /* */ #include -- 2.30.2