From 67875e2069c3f5d1688ca4040e98edc4bad547f5 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 15 Jun 2019 09:25:05 +0200 Subject: [PATCH] batman-adv: Add support for hardif settings B.A.T.M.A.N. V support additional settings which are hardif specific. The batadv_hardif proto has to expose them to allow automatic configuration. The default configuration would be: config interface 'bat0_hardif_eth0' option proto 'batadv_hardif' option master 'bat0' option ifname 'eth0' option mtu '1536' option 'elp_interval' 500 # string like '1mbit' is accepted instead of kbit for override option 'throughput_override' '0' Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 2 +- batman-adv/files/lib/netifd/proto/batadv_hardif.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 0505fdf..84f2274 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2019.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=70c3f6a6cf88d2b25681a76768a52ed92d9fe992ba8e358368b6a8088757adc8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/batman-adv/files/lib/netifd/proto/batadv_hardif.sh b/batman-adv/files/lib/netifd/proto/batadv_hardif.sh index 9283d2b..76ccd81 100755 --- a/batman-adv/files/lib/netifd/proto/batadv_hardif.sh +++ b/batman-adv/files/lib/netifd/proto/batadv_hardif.sh @@ -7,21 +7,30 @@ } proto_batadv_hardif_init_config() { + proto_config_add_int 'elp_interval' proto_config_add_string "master" + proto_config_add_string 'throughput_override' } proto_batadv_hardif_setup() { local config="$1" local iface="$2" + local elp_interval local master + local throughput_override + json_get_vars elp_interval json_get_vars master + json_get_vars throughput_override ( proto_add_host_dependency "$config" '' "$master" ) batctl -m "$master" interface -M add "$iface" + [ -n "$elp_interval" ] && batctl -m "$master" hardif "$iface" elp_interval "$elp_interval" + [ -n "$throughput_override" ] && batctl -m "$master" hardif "$iface" throughput_override "$throughput_override" + proto_init_update "$iface" 1 proto_send_update "$config" } -- 2.30.2