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

On branch : master

commit cc06b8553704e6303152e740f6ba312a7930f317 Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Feb 9 10:18:14 2012 +0000

batman-adv-devel: merge bla2, add batman v & rebase on trunk

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

cc06b8553704e6303152e740f6ba312a7930f317 batman-adv-devel/Config.in | 10 +++++++--- batman-adv-devel/Makefile | 7 ++++--- batman-adv-devel/files/lib/batman-adv/config.sh | 4 ---- 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 7239f34..f67f69e 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -3,6 +3,10 @@ config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG bool "enable verbose debug logging" depends PACKAGE_kmod-batman-adv-devel default n +config KMOD_BATMAN_ADV_DEVEL_BLA + bool "enable bridge loop avoidance" + depends PACKAGE_kmod-batman-adv-devel + default y config KMOD_BATMAN_ADV_DEVEL_BATCTL bool "enable batctl" depends PACKAGE_kmod-batman-adv-devel @@ -21,8 +25,8 @@ choice config KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER bool "master"

- config KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 - bool "bridge loop avoidance" + config KMOD_BATMAN_ADV_DEVEL_BRANCH_BATMANV + bool "batman V routing algorithm"

config KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN bool "network encoding (alias catwoman)" @@ -34,6 +38,6 @@ endchoice config KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME string default "master" if KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER - default "bla2" if KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2 + default "batmanv" if KMOD_BATMAN_ADV_DEVEL_BRANCH_BATMANV default "catwoman" if KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN default "dat" if KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 6289358..718c9c4 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:=b82b9b254c8a923fb2d65e2ca3eefc2e8b4429e7 -PKG_BATCTL_REV:=d9ee7eed3175992be75e2cb949c048bdddeb0769 +PKG_BATMAN_REV:=052332fb1a2d694fdc10bb0ebef495bbcb6fb06d +PKG_BATCTL_REV:=7dd21c88f6c1484ce0cbf52dca7b9fc86c2c9bb0

PKG_BATMAN_BRANCH:=$(subst ",,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) @@ -59,7 +59,8 @@ MAKE_BATMAN_ADV_ARGS += \ SUBDIRS="$(PKG_BUILD_DIR)" \ PWD="$(PKG_BUILD_DIR)" \ LINUX_VERSION="$(LINUX_VERSION)" \ - $(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),CONFIG_BATMAN_ADV_DEBUG=y) \ + CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \ + CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BLA),y,n) \ REVISION="$(PKG_BATMAN_BRANCH)-$(PKG_BATMAN_SHORTREV)" all

MAKE_BATCTL_ARGS += \ diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 62645ee..d0569bc 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -4,8 +4,6 @@ bat_config(){ local mesh="$1" local aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval hop_penalty vis_mode

- logger -st batman-adv "config_bat: mesh = $mesh" - config_get aggregated_ogms "$mesh" aggregated_ogms config_get bonding "$mesh" bonding config_get fragmentation "$mesh" fragmentation @@ -36,14 +34,12 @@ bat_add_interface(){

sleep 3s # some device (ath) is very lazy to start config_get interfaces $mesh interfaces - logger -st batman-adv "add_interface: mesh = $mesh, iface = $interface, ifaces = $interfaces" for iface in $interfaces; do [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || { iface=$(uci -q -P/var/state get network.$iface.ifname) [ -f "/sys/class/net/$iface/batman_adv/mesh_iface" ] || continue } - logger -st batman-adv "add_interface: $iface == $interface -> mesh = $mesh" [ "$iface" = "$interface" ] && echo $mesh > /sys/class/net/$iface/batman_adv/mesh_iface done }