batman-adv: upgrade package to latest release (2011.0.0)

SVN-Revision: 25254

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index 7a6cd7b87cde2a64094d9e2ce349ecd5a9ccb6b3..ee2aa54606ad93e3d93bd40856b6fd7a255df78f 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 
-PKG_VERSION:=2010.2.0
-PKG_MD5SUM:=c233f06bd94432d7697ad78241e8bdd6
-BATCTL_MD5SUM:=f16d7332576c7b4fc9f8a37add235225
+PKG_VERSION:=2011.0.0
+PKG_MD5SUM:=9f59f63010f083a1ff56f977c9972f71
+BATCTL_MD5SUM:=48e1b3c4b6033215abb52ae757746f05
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

diff --git a/net/batman-advanced/files/etc/config/batman-adv b/net/batman-advanced/files/etc/config/batman-adv
index dbce507d073760a25a6a5917400ab022b9b06acb..9c66c93fe6b01a5362e5e9039ba4c007c53f4203 100644 (file)
--- a/net/batman-advanced/files/etc/config/batman-adv
+++ b/net/batman-advanced/files/etc/config/batman-adv
@@ -1,9 +1,13 @@
 
 config 'mesh' 'bat0'
        option 'interfaces' 'wlan0'
-       option 'orig_interval'
-       option 'log_level'
        option 'aggregated_ogms'
        option 'bonding'
        option 'fragmentation'
+       option 'gw_bandwidth'
+       option 'gw_mode'
+       option 'gw_sel_class'
+       option 'log_level'
+       option 'orig_interval'
        option 'vis_mode'
+

diff --git a/net/batman-advanced/files/etc/init.d/batman-adv b/net/batman-advanced/files/etc/init.d/batman-adv
index 120413d1e04a83029203731a62c72134a1b73231..5011b6d1835899c77b831411d43e7b85f9bdb5b5 100644 (file)
--- a/net/batman-advanced/files/etc/init.d/batman-adv
+++ b/net/batman-advanced/files/etc/init.d/batman-adv
@@ -13,17 +13,20 @@ is_module_loaded() {
 
 start_mesh () {
        local meshif="$1"
-       local interfaces orig_interval log_level aggregated_ogms bonding fragmentation vis_mode
+       local interfaces aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode
 
        is_module_loaded
        [ $? -ne 1 ] && return
 
        config_get interfaces "$meshif" interfaces
-       config_get orig_interval "$meshif" orig_interval
-       config_get log_level "$meshif" log_level
        config_get aggregated_ogms "$meshif" aggregated_ogms
        config_get bonding "$meshif" bonding
        config_get fragmentation "$meshif" fragmentation
+       config_get gw_bandwidth "$meshif" gw_bandwidth
+       config_get gw_mode "$meshif" gw_mode
+       config_get gw_sel_class "$meshif" gw_sel_class
+       config_get log_level "$meshif" log_level
+       config_get orig_interval "$meshif" orig_interval
        config_get vis_mode "$meshif" vis_mode
 
        if [ "$interfaces" = "" ]; then
@@ -56,6 +59,18 @@ start_mesh () {
        if [ $fragmentation ]; then
                echo $fragmentation > /sys/class/net/$meshif/mesh/fragmentation
        fi
+       
+       if [ $gw_bandwidth ]; then
+               echo $gw_bandwidth > /sys/class/net/$meshif/mesh/gw_bandwidth
+       fi
+       
+       if [ $gw_mode ]; then 
+               echo $gw_mode > /sys/class/net/$meshif/mesh/gw_mode
+       fi
+       
+       if [ $gw_sel_class ]; then
+               echo $gw_sel_class > /sys/class/net/$meshif/mesh/gw_sel_class
+       fi
 
        if [ $vis_mode ]; then
                echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode