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