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

On branch : master

commit 1d8a8756d0a15360b2cdb559e2b5df8a089098fd Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Nov 14 15:30:06 2011 +0000

batman-adv-devel: update to latest master & add ap_isolation support

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

1d8a8756d0a15360b2cdb559e2b5df8a089098fd batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/etc/config/batman-adv | 1 + batman-adv-devel/files/lib/batman-adv/config.sh | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 1064cef..285b807 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=batman-adv-devel

-PKG_BATMAN_REV:=00ca20ef24617946e37bf69ca0a374f86ea56e6b -PKG_BATCTL_REV:=9031e43c3d40a1771d6969c44e06ba4229ee6522 +PKG_BATMAN_REV:=44bb66d56dd8bcbdd9f92bf43280a6b956a65652 +PKG_BATCTL_REV:=ab16078808bf32b473d65055d7788793307f8cc1

PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 31ef797..414b119 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -2,6 +2,7 @@ config 'mesh' 'bat0' option 'interfaces' 'mesh' option 'aggregated_ogms' + option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 347e307..58a01d2 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -13,13 +13,14 @@ is_module_loaded() {

start_mesh () { local meshif="$1" - local interfaces aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode + local interfaces aggregated_ogms ap_isolation bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode

is_module_loaded [ $? -ne 1 ] && return

config_get interfaces "$meshif" interfaces config_get aggregated_ogms "$meshif" aggregated_ogms + config_get ap_isolation "$meshif" ap_isolation config_get bonding "$meshif" bonding config_get fragmentation "$meshif" fragmentation config_get gw_bandwidth "$meshif" gw_bandwidth @@ -57,6 +58,10 @@ start_mesh () { echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms fi + if [ $ap_isolation ]; then + echo $ap_isolation > /sys/class/net/$meshif/mesh/ap_isolation + fi + if [ $bonding ]; then echo $bonding > /sys/class/net/$meshif/mesh/bonding fi