From ffa7f2c6eaa195409718cb30b69f0921d5fb31bd Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 21 Jul 2020 22:29:33 +0200 Subject: [PATCH 1/4] batctl: Enable build of mcast_flags subcommand MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mcast_flags subcommand allows to query the mcast_flags of the current device and of the seen originators. It should be enabled for the default and full variants. But the configuration string wasn't correctly included in the list when the variants were prepared and thus disabled in all variants. Reported-by: Linus Lüssing Fixes: 129986825219 ("batctl: Provide different variants") Signed-off-by: Sven Eckelmann --- batctl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index 895e9ea..9c0fa46 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2020.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) @@ -154,7 +154,7 @@ config-tables := \ claimtable \ dat_cache \ gateways \ - loglevel \ + mcast_flags \ nc_nodes \ neighbors \ originators \ From 7091b787600b2859357b6bca69b72224eeb864b2 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 25 Aug 2020 20:07:05 +0200 Subject: [PATCH 2/4] alfred: upgrade package to latest release 2020.3 * synchronization of batman-adv netlink header Signed-off-by: Sven Eckelmann --- alfred/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index f52e3a9..fcb89ac 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred -PKG_VERSION:=2020.2 -PKG_RELEASE:=2 +PKG_VERSION:=2020.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=1cca2f600f585455a598c92de6fa2b4307c6fe76dddd9d4d29c7648212db9f5e +PKG_HASH:=821739e570fc3da9936e70075ec04a3caf3b847cc8702f13a0725e903e637b8d PKG_MAINTAINER:=Simon Wunderlich PKG_LICENSE:=GPL-2.0-only MIT From 4e7401602b1754a7c180532a3b960abd6542f16f Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 25 Aug 2020 20:07:05 +0200 Subject: [PATCH 3/4] batctl: upgrade package to latest release 2020.3 * add per interface hop penalty command Signed-off-by: Sven Eckelmann --- batctl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index 9c0fa46..d2140c1 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -PKG_VERSION:=2020.2 -PKG_RELEASE:=2 +PKG_VERSION:=2020.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=d29cdb53ee68abd5027eae07d9fd645b3f154e0d577efa2666c1334bb6d60efd +PKG_HASH:=3513f7eb3f61817b6894b90832aa5eba513293f487d174ebc98f1bafc9165c64 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich From c201b00922f0ee92b146bb18d15d8456fbff5ec7 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 25 Aug 2020 20:07:05 +0200 Subject: [PATCH 4/4] batman-adv: upgrade package to latest release 2020.3 * support latest kernels (4.4 - 5.9) * coding style cleanups and refactoring * introduce a configurable per interface hop penalty * bugs squashed: - avoid uninitialized chaddr when handling DHCP - fix own OGMv2 check in aggregation receive handling - fix "NOHZ: local_softirq_pending 08" warnings caused by BLA Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 4 ++-- batman-adv/files/lib/netifd/proto/batadv_hardif.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 5813b05..c44324f 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2020.2 +PKG_VERSION:=2020.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=a73f5ce72c6efa9dd7bd7cc8daa667d0982e12e40811c978bb652607bb5666a3 +PKG_HASH:=65516dca919ea5be58d141c78bd1f0a94a02a784c5c85fb4e8f27f4226803f73 PKG_EXTMOD_SUBDIRS:=net/batman-adv PKG_MAINTAINER:=Simon Wunderlich diff --git a/batman-adv/files/lib/netifd/proto/batadv_hardif.sh b/batman-adv/files/lib/netifd/proto/batadv_hardif.sh index 6eb597f..b2f87dd 100755 --- a/batman-adv/files/lib/netifd/proto/batadv_hardif.sh +++ b/batman-adv/files/lib/netifd/proto/batadv_hardif.sh @@ -8,6 +8,7 @@ proto_batadv_hardif_init_config() { proto_config_add_int 'elp_interval' + proto_config_add_int 'hop_penalty' proto_config_add_string "master" proto_config_add_string 'throughput_override' } @@ -17,10 +18,12 @@ proto_batadv_hardif_setup() { local iface="$2" local elp_interval + local hop_penalty local master local throughput_override json_get_vars elp_interval + json_get_vars hop_penalty json_get_vars master json_get_vars throughput_override @@ -29,6 +32,7 @@ proto_batadv_hardif_setup() { batctl meshif "$master" interface -M add "$iface" [ -n "$elp_interval" ] && batctl hardif "$iface" elp_interval "$elp_interval" + [ -n "$hop_penalty" ] && batctl hardif "$iface" hop_penalty "$hop_penalty" [ -n "$throughput_override" ] && batctl hardif "$iface" throughput_override "$throughput_override" proto_init_update "$iface" 1