Merge pull request #427 from ecsv/batadv-2018.4

batman-adv 2018.4

diff --git a/alfred/Makefile b/alfred/Makefile
index f468abc5dfa9f96d8724cb66ecf6bcc5239c8869..926f535b49909b421854f4d3b5bcdc8762bbb0c2 100644 (file)
--- a/alfred/Makefile
+++ b/alfred/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=alfred
-PKG_VERSION:=2018.3
-PKG_RELEASE:=1
-PKG_HASH:=6265b8a3e99186ecb6e0cf7dde84fe8b67c66d9fefa6286f9f12110e98f28b1a
+PKG_VERSION:=2018.4
+PKG_RELEASE:=0
+PKG_HASH:=8d6595201d5d21b4e3824d408dc9ed705789af1d8831692efa8ffe69a3e1cc58
 
 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/batctl/Makefile b/batctl/Makefile
index 8765d15206a991c655bfa34cf76bfb818b6fb9c9..045ecde9b4fa1960f24c0c8a8e941c5ac04bf75e 100644 (file)
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batctl
 
-PKG_VERSION:=2018.3
-PKG_RELEASE:=1
-PKG_HASH:=24e32d3fe8268ce0951903546e71b925b78b17acc8809ba899940f48a5e892e6
+PKG_VERSION:=2018.4
+PKG_RELEASE:=0
+PKG_HASH:=e43827a5e868b4e134e77ca04da989fde1981463166bf1b6f2053acc3edd6257
 
 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/Config.in b/batman-adv/Config.in
index 52a688bb78a41e14845e3078c480844b6f3edcae..a6c8ad3b7f9ed65d073add7a4fa58506d3532437 100644 (file)
--- 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 898efe3e1ac8581b55167c81c139e889d0a13aca..dc73feefa6a26c0ae4cf1a3dbdea0e7e59764558 100644 (file)
--- 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)))) \