Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branches: ecsv/master,master

commit 1ae0f1d884d3bdcb4f7431b90c05f176d28a4325 Author: Sven Eckelmann sven.eckelmann@open-mesh.com Date: Mon Jan 30 14:52:25 2017 +0100

batman-adv-devel: Remove non-existing setting "vis_mode"

There is no vis_mode in the batman-adv kernel module since batman-adv 2014.0.0. So don't expose such a setting in uci.

Signed-off-by: Sven Eckelmann sven.eckelmann@open-mesh.com

1ae0f1d884d3bdcb4f7431b90c05f176d28a4325 batman-adv-devel/files/etc/config/batman-adv | 1 - batman-adv-devel/files/lib/batman-adv/config.sh | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index f38855e..97be622 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -9,7 +9,6 @@ config 'mesh' 'bat0' option 'gw_sel_class' option 'log_level' option 'orig_interval' - option 'vis_mode' option 'bridge_loop_avoidance' option 'distributed_arp_table' option 'multicast_mode' diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 1429a43..3039d3c 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -13,7 +13,7 @@ bat_config() local mesh="$1" local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation local gw_bandwidth gw_mode gw_sel_class isolation_mark hop_penalty multicast_mode network_coding log_level - local orig_interval vis_mode + local orig_interval

config_get aggregated_ogms "$mesh" aggregated_ogms config_get ap_isolation "$mesh" ap_isolation @@ -30,7 +30,6 @@ bat_config() config_get network_coding "$mesh" network_coding config_get log_level "$mesh" log_level config_get orig_interval "$mesh" orig_interval - config_get vis_mode "$mesh" vis_mode

[ ! -f "/sys/class/net/$mesh/mesh/orig_interval" ] && echo "batman-adv mesh $mesh does not exist - check your interface configuration" && return 1

@@ -49,5 +48,4 @@ bat_config() [ -n "$network_coding" ] && echo $network_coding > /sys/class/net/$mesh/mesh/network_coding 2>&- [ -n "$log_level" ] && echo $log_level > /sys/class/net/$mesh/mesh/log_level 2>&- [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval - [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode }