openwrt-mirror/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2025-12-22 14:44:37 +04:00
Code Issues Packages Projects Releases Wiki Activity

batman-adv: Don't try to set unconfigured ap_isolation for vlan

Browse Source 
The ap_isolation setting only supports boolean values. So setting an empty
string as ap_isolation is not supported by batctl.

Fixes: f5205d7d24 ("batman-adv: upgrade package to latest release 2014.2.0")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann
2019-06-16 09:27:08 +02:00
parent 67875e2069
commit e87a25f408
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
batman-adv/Makefile
View File

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv PKG_NAME:=batman-adv
PKG_VERSION:=2019.2 PKG_VERSION:=2019.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_HASH:=70c3f6a6cf88d2b25681a76768a52ed92d9fe992ba8e358368b6a8088757adc8 PKG_HASH:=70c3f6a6cf88d2b25681a76768a52ed92d9fe992ba8e358368b6a8088757adc8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

4
batman-adv/files/lib/netifd/proto/batadv_vlan.sh
View File

@@ -5,7 +5,7 @@
init_proto "$@" init_proto "$@"
proto_batadv_vlan_init_config() { proto_batadv_vlan_init_config() {
proto_config_add_string "ap_isolation" proto_config_add_boolean 'ap_isolation:bool'
} }
proto_batadv_vlan_setup() { proto_batadv_vlan_setup() {
@@ -17,7 +17,7 @@ proto_batadv_vlan_setup() {
json_get_vars ap_isolation json_get_vars ap_isolation
batctl -m "$iface" ap_isolation "$ap_isolation" [ -n "$ap_isolation" ] && batctl -m "$iface" ap_isolation "$ap_isolation"
proto_init_update "$iface" 1 proto_init_update "$iface" 1
proto_send_update "$config" proto_send_update "$config"
} }