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

On branch : master

commit 2dedac524dc5e5471f5e9ade66e6dc3aab4eb1c5 Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Sep 5 21:17:27 2010 +0000

batman-adv-devel: updating package to latest

2dedac524dc5e5471f5e9ade66e6dc3aab4eb1c5 batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/etc/config/batman-adv | 3 ++- batman-adv-devel/files/etc/init.d/batman-adv | 19 ++++++++++++------- 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 0f80b55..633eda0 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=batman-adv-devel

-PKG_REV:=1729 +PKG_REV:=1787

PKG_VERSION:=r$(PKG_REV) PKG_SOURCE_PROTO:=svn @@ -49,7 +49,7 @@ MAKE_BATMAN_ADV_ARGS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ PATH="$(TARGET_PATH)" \ - $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG") \ + $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),EXTRA_CFLAGS="-DCONFIG_BATMAN_ADV_DEBUG -DREVISION_VERSION=\"$(PKG_REV)\"") \ SUBDIRS="$(PKG_BUILD_DIR)/batman-adv" \ LINUX_VERSION="$(LINUX_VERSION)" \ REVISION="$(PKG_REV)" modules diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 9c09691..886fdb9 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -3,5 +3,6 @@ config 'mesh' 'bat0' option 'interfaces' 'wlan0' option 'orig_interval' option 'log_level' - option 'aggregate_ogm' + option 'aggregated_ogms' + option 'bonding' option 'vis_mode' diff --git a/batman-adv-devel/files/etc/init.d/batman-adv b/batman-adv-devel/files/etc/init.d/batman-adv index 49f948f..a08b21e 100644 --- a/batman-adv-devel/files/etc/init.d/batman-adv +++ b/batman-adv-devel/files/etc/init.d/batman-adv @@ -13,7 +13,7 @@ is_module_loaded() {

start_mesh () { local meshif="$1" - local interfaces orig_interval log_level aggregate_ogm vis_mode + local interfaces orig_interval log_level aggregated_ogms bonding vis_mode

is_module_loaded [ $? -ne 1 ] && return @@ -21,7 +21,8 @@ start_mesh () { config_get interfaces "$meshif" interfaces config_get orig_interval "$meshif" orig_interval config_get log_level "$meshif" log_level - config_get aggregate_ogm "$meshif" aggregate_ogm + config_get aggregated_ogms "$meshif" aggregated_ogms + config_get bonding "$meshif" bonding config_get vis_mode "$meshif" vis_mode

if [ "$interfaces" = "" ]; then @@ -36,19 +37,23 @@ start_mesh () { done

if [ $orig_interval ]; then - echo $orig_interval > /sys/class/net/$meshif/batman_adv/originator_interval + echo $orig_interval > /sys/class/net/$meshif/mesh/orig_interval fi

if [ $log_level ]; then - echo $log_level > /sys/module/batman_adv/parameters/debug 2>&- + echo $log_level > /sys/class/net/$meshif/mesh/log_level 2>&- fi

- if [ $aggregate_ogm ]; then - echo $aggregate_ogm > /sys/class/net/$meshif/batman_adv/aggregate_ogm + if [ $aggregated_ogms ]; then + echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms + fi + + if [ $bonding ]; then + echo $bonding > /sys/class/net/$meshif/mesh/bonding fi

if [ $vis_mode ]; then - echo $vis_mode > /sys/class/net/$meshif/batman_adv/vis_mode + echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode fi }