Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
>---------------------------------------------------------------
commit 40f16985b1cfd6a0350aef7a9bb9aadb73792ea4
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Sun Feb 16 17:57:21 2014 +0800
batman-adv-devel: update to latest master and add multicast support
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
40f16985b1cfd6a0350aef7a9bb9aadb73792ea4
batman-adv-devel/Config.in | 7 ++++++-
batman-adv-devel/Makefile | 8 ++++----
batman-adv-devel/files/etc/config/batman-adv | 1 +
batman-adv-devel/files/lib/batman-adv/config.sh | 4 +++-
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index 82f0905..99e38dd 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -14,6 +14,11 @@ config KMOD_BATMAN_ADV_DEVEL_DAT
depends on PACKAGE_kmod-batman-adv-devel
default y
+config KMOD_BATMAN_ADV_DEVEL_MCAST
+ bool "enable multicast transmission optimization"
+ depends on PACKAGE_kmod-batman-adv-devel
+ default y
+
config KMOD_BATMAN_ADV_DEVEL_NC
bool "enable network coding [requires promisc mode support]"
depends on PACKAGE_kmod-batman-adv-devel
@@ -23,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 "fbe649d"
+ default "0dd5d2c"
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/Makefile b/batman-adv-devel/Makefile
index 39bbb2f..e8b0881 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -10,9 +10,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batman-adv-devel
-PKG_BATMAN_REV:=$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_REV)
-
-PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_BATMAN_REV) | cut -c1-7)
+PKG_VERSION:=$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_REV)
+PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_VERSION) | cut -c1-7)
PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz
PKG_BATMAN_DIR:=batman-adv-$(PKG_BATMAN_SHORTREV)
@@ -37,7 +36,7 @@ endef
define KernelPackage/batman-adv-devel/description
B.A.T.M.A.N. advanced is a kernel module which allows to
build layer 2 mesh networks. This package builds the latest
-development version ($(PKG_BATMAN_SHORTREV)).
+development version.
endef
define KernelPackage/batman-adv-devel/config
@@ -55,6 +54,7 @@ MAKE_BATMAN_ADV_ARGS += \
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) \
CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DAT),y,n) \
+ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_MCAST),y,n) \
CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_NC),y,n) \
REVISION="$(PKG_BATMAN_SHORTREV)" all
diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv
index 79d660d..1922310 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 'vis_mode'
option 'bridge_loop_avoidance'
option 'distributed_arp_table'
+ option 'multicast_mode'
option 'network_coding'
option 'hop_penalty'
diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh
index 471c1f2..58fbfe1 100644
--- a/batman-adv-devel/files/lib/batman-adv/config.sh
+++ b/batman-adv-devel/files/lib/batman-adv/config.sh
@@ -12,7 +12,7 @@ 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 network_coding log_level orig_interval vis_mode
+ local gw_bandwidth gw_mode gw_sel_class hop_penalty multicast_mode network_coding log_level orig_interval vis_mode
config_get aggregated_ogms "$mesh" aggregated_ogms
config_get ap_isolation "$mesh" ap_isolation
@@ -24,6 +24,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 multicast_mode "$mesh" multicast_mode
config_get network_coding "$mesh" network_coding
config_get log_level "$mesh" log_level
config_get orig_interval "$mesh" orig_interval
@@ -41,6 +42,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 "$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>&-
[ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval