Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
commit db75a39f61d1d58e44013015edf72420d8244091 Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Nov 4 20:08:50 2012 +0800
batman-adv-devel: upgrade to latest master
* add DAT compile & config script support * auto-select crc32c dependency
Signed-off-by: Marek Lindner lindner_marek@yahoo.de
db75a39f61d1d58e44013015edf72420d8244091 batman-adv-devel/Config.in | 13 +++++++++++-- batman-adv-devel/Makefile | 3 ++- batman-adv-devel/files/etc/config/batman-adv | 1 + batman-adv-devel/files/lib/batman-adv/config.sh | 6 ++++-- 4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 78bc5a7..d7404fb 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -3,10 +3,17 @@ 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_DAT + bool "enable distributed arp table" + depends PACKAGE_kmod-batman-adv-devel + default y + config KMOD_BATMAN_ADV_DEVEL_BATCTL bool "enable batctl" depends PACKAGE_kmod-batman-adv-devel @@ -19,7 +26,8 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV string prompt "batman-adv git revision to build package with" - default "3fdeaa6" + depends PACKAGE_kmod-batman-adv-devel + default "59f8434" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches @@ -28,7 +36,8 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV string prompt "batctl git revision to build package with" - default "acd06db" + depends PACKAGE_kmod-batman-adv-devel + default "d81bf38" 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 db58b99..c57c327 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -33,7 +33,7 @@ define KernelPackage/batman-adv-devel URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner lindner_marek@yahoo.de SUBMENU:=Network Support - DEPENDS:=+kmod-lib-crc16 +libc + DEPENDS:=+kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c +libc TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) @@ -60,6 +60,7 @@ MAKE_BATMAN_ADV_ARGS += \ LINUX_VERSION="$(LINUX_VERSION)" \ 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) \ REVISION="$(PKG_BATMAN_SHORTREV)" all
MAKE_BATCTL_ARGS += \ diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv index 766d949..6ec9e03 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 'distributed_arp_table' option 'hop_penalty'
# yet another batX instance diff --git a/batman-adv-devel/files/lib/batman-adv/config.sh b/batman-adv-devel/files/lib/batman-adv/config.sh index 295b543..0917462 100644 --- a/batman-adv-devel/files/lib/batman-adv/config.sh +++ b/batman-adv-devel/files/lib/batman-adv/config.sh @@ -11,13 +11,14 @@ bat_load_module() bat_config() { local mesh="$1" - local aggregated_ogms ap_isolation bonding bridge_loop_avoidance fragmentation gw_bandwidth - local gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode + local aggregated_ogms ap_isolation bonding bridge_loop_avoidance distributed_arp_table fragmentation + local gw_bandwidth gw_mode gw_sel_class hop_penalty log_level orig_interval vis_mode
config_get aggregated_ogms "$mesh" aggregated_ogms config_get ap_isolation "$mesh" ap_isolation config_get bonding "$mesh" bonding config_get bridge_loop_avoidance "$mesh" bridge_loop_avoidance + config_get distributed_arp_table "$mesh" distributed_arp_table config_get fragmentation "$mesh" fragmentation config_get gw_bandwidth "$mesh" gw_bandwidth config_get gw_mode "$mesh" gw_mode @@ -33,6 +34,7 @@ bat_config() [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation [ -n "$bonding" ] && echo $bonding > /sys/class/net/$mesh/mesh/bonding [ -n "$bridge_loop_avoidance" ] && echo $bridge_loop_avoidance > /sys/class/net/$mesh/mesh/bridge_loop_avoidance + [ -n "$distributed_arp_table" ] && echo $distributed_arp_table > /sys/class/net/$mesh/mesh/distributed_arp_table [ -n "$fragmentation" ] && echo $fragmentation > /sys/class/net/$mesh/mesh/fragmentation [ -n "$gw_bandwidth" ] && echo $gw_bandwidth > /sys/class/net/$mesh/mesh/gw_bandwidth [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode