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

On branch : master

commit 1f25a7087ab99a3e7c58b7c8c9bf51caa3a49022 Author: Marek Lindner mareklindner@neomailbox.ch Date: Thu Mar 13 20:45:09 2014 +0800

batman-adv-devel: update to latest master and add support for isolation mark

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

1f25a7087ab99a3e7c58b7c8c9bf51caa3a49022 batctl-devel/Makefile | 2 +- batman-adv-devel/Config.in | 2 +- batman-adv-devel/files/etc/config/batman-adv | 1 + batman-adv-devel/files/lib/batman-adv/config.sh | 5 ++++- 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index e119851..13fd1f5 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=batctl-devel

-PKG_VERSION:=abe78a50dd868167121e11f37b166c8193816999 +PKG_VERSION:=1d48de5 PKG_BATCTL_SHORTREV:=$(shell echo $(PKG_VERSION) | cut -c1-7) PKG_BATCTL_FNAME:=batctl-devel-$(PKG_BATCTL_SHORTREV).tar.gz PKG_BATCTL_DIR:=batctl-$(PKG_BATCTL_SHORTREV) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 99e38dd..9101d36 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -28,7 +28,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV string prompt "batman-adv git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "0dd5d2c" + default "c7cc2d4" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 1922310..f38855e 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -15,6 +15,7 @@ config 'mesh' 'bat0' option 'multicast_mode' option 'network_coding' option 'hop_penalty' + option 'isolation_mark'

# yet another batX instance # config 'mesh' 'bat5' diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 58fbfe1..1429a43 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -12,7 +12,8 @@ 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 hop_penalty multicast_mode network_coding log_level orig_interval vis_mode + local gw_bandwidth gw_mode gw_sel_class isolation_mark hop_penalty multicast_mode network_coding log_level + local orig_interval vis_mode

config_get aggregated_ogms "$mesh" aggregated_ogms config_get ap_isolation "$mesh" ap_isolation @@ -24,6 +25,7 @@ bat_config() config_get gw_mode "$mesh" gw_mode config_get gw_sel_class "$mesh" gw_sel_class config_get hop_penalty "$mesh" hop_penalty + config_get isolation_mark "$mesh" isolation_mark config_get multicast_mode "$mesh" multicast_mode config_get network_coding "$mesh" network_coding config_get log_level "$mesh" log_level @@ -42,6 +44,7 @@ bat_config() [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty + [ -n "$isolation_mark" ] && echo $isolation_mark > /sys/class/net/$mesh/mesh/isolation_mark [ -n "$multicast_mode" ] && echo $multicast_mode > /sys/class/net/$mesh/mesh/multicast_mode 2>&- [ -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>&-