From 4167ad2c62503b33a81ca89f3180debafd364b6d Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 6 Nov 2018 10:49:18 +0100 Subject: [PATCH] batman-adv: upgrade package to latest release 2018.4 * support latest kernels (3.16 - 4.20) * coding style cleanups and refactoring * improve tx performance by avoiding unnecessary locking * add help messages regarding deprecation of debugfs files * support for debug message tracepoints * explicit ELP padding to allow TVLVs in the future * bugs squashed: - fix skb_over_panic for merged fragments with small tailroom Signed-off-by: Sven Eckelmann --- batman-adv/Config.in | 13 +++++++++++++ batman-adv/Makefile | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/batman-adv/Config.in b/batman-adv/Config.in index 52a688b..a6c8ad3 100644 --- a/batman-adv/Config.in +++ b/batman-adv/Config.in @@ -71,6 +71,7 @@ config BATMAN_ADV_NC config BATMAN_ADV_MCAST bool "Multicast optimisation" depends on PACKAGE_kmod-batman-adv + default y help This option enables the multicast optimisation which aims to reduce the air overhead while improving the reliability of @@ -95,3 +96,15 @@ config BATMAN_ADV_DEBUG say N here. This enables compilation of support for outputting debugging information to the kernel log. The output is controlled via the module parameter debug. + +config BATMAN_ADV_TRACING + bool "B.A.T.M.A.N. tracing support" + depends on PACKAGE_kmod-batman-adv + select KERNEL_FTRACE + select KERNEL_ENABLE_DEFAULT_TRACERS + help + This is an option for use by developers; most people should + say N here. Select this option to gather traces like the debug + messages using the generic tracing infrastructure of the kernel. + BATMAN_ADV_DEBUG must also be selected to get trace events for + batadv_dbg. diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 898efe3..dc73fee 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2018.3 -PKG_RELEASE:=2 -PKG_HASH:=33f3f942203732e0568a6bc0226a0fe8eb147c961f0d0c13b2e6b16237d412ff +PKG_VERSION:=2018.4 +PKG_RELEASE:=0 +PKG_HASH:=3500b4bc7d41ce1adef0b0684972a439d48b454ba78282e94df13ba90605484d PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) @@ -59,6 +59,7 @@ PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_MCAST),y,n) \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_NC),y,n) \ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_BATMAN_V),y,n) \ + CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_TRACING),y,n) \ PKG_EXTRA_CFLAGS:= \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ -- 2.30.2