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

On branch : master

commit 782034b6b17833e014ad70dc8e49e19534624d8b Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Jul 4 10:09:11 2012 +0000

batman-adv-devel: update to latest master

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

782034b6b17833e014ad70dc8e49e19534624d8b batman-adv-devel/Makefile | 4 ++-- batman-adv-devel/files/etc/config/batman-adv | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 074be94..a290369 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:=c3c748339f605c034bac3317a93e10fc0f8d1d0a -PKG_BATCTL_REV:=3e88396b24c65bc438be54e80f930a728ab5c65b +PKG_BATMAN_REV:=5deb69f60f388055982a1da6dce876049f86841d +PKG_BATCTL_REV:=b7b948479ca2c12ad4f038c974ee20294005ddf1

PKG_BATMAN_BRANCH:=$(subst ",,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7) diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index fb7b384..766d949 100644 --- a/batman-adv-devel/files/etc/config/batman-adv +++ b/batman-adv-devel/files/etc/config/batman-adv @@ -12,6 +12,7 @@ config 'mesh' 'bat0' option 'orig_interval' option 'vis_mode' option 'bridge_loop_avoidance' + option 'hop_penalty'

# yet another batX instance # config 'mesh' 'bat5'