[openwrt-feed-batman-adv] master: batctl-devel: update to latest master (8897c75)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
>---------------------------------------------------------------
commit 8897c75d355211c585e57cb5858e9e2f762c48a1
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Sat Jan 30 15:10:18 2016 +0800
batctl-devel: update to latest master
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
8897c75d355211c585e57cb5858e9e2f762c48a1
batctl-devel/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile
index 1c93c0b..d12b8c1 100644
--- a/batctl-devel/Makefile
+++ b/batctl-devel/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=batctl-devel
-PKG_VERSION:=2c2cb26
+PKG_VERSION:=7a3d563
PKG_BATCTL_SHORTREV:=$(shell echo $(PKG_VERSION) | cut -c1-7)
PKG_BATCTL_FNAME:=batctl-devel-$(PKG_BATCTL_SHORTREV).tar.gz
PKG_BATCTL_DIR:=batctl-$(PKG_BATCTL_SHORTREV)
7 years
[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master (80910c2)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
>---------------------------------------------------------------
commit 80910c2d5e7ed88f67d7d4cc257181e7b8fe3ce9
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Sat Jan 30 15:10:32 2016 +0800
batman-adv-devel: update to latest master
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
80910c2d5e7ed88f67d7d4cc257181e7b8fe3ce9
batman-adv-devel/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in
index f648962..700a15e 100644
--- a/batman-adv-devel/Config.in
+++ b/batman-adv-devel/Config.in
@@ -33,7 +33,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 "7da6fe1d"
+ default "d5e8ba8"
help
Enter the full or shortened git revision to override package
default value. This allows to build from non-master branches
7 years
[openwrt-feed-batman-adv] master: openwrt-feed-batman-adv: Allow to select routing algorithm (3dafbb1)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
>---------------------------------------------------------------
commit 3dafbb14e5306abf23e791c750f273b05749600f
Author: Sven Eckelmann <sven(a)open-mesh.com>
Date: Tue Jan 19 12:47:07 2016 +0100
openwrt-feed-batman-adv: Allow to select routing algorithm
The network config section for proto batadv now allows to select the
routing algorithm via the option routing_algo. This allows to chose between
BATMAN_IV and BATMAN_V when BATMAN_V is released. This option is only
useful when a new batman-adv device is created and not when only a device
is added to an already existing batman-adv device.
Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
3dafbb14e5306abf23e791c750f273b05749600f
batman-adv-devel/files/etc/config/batman-adv | 1 +
batman-adv-devel/files/lib/netifd/proto/batadv.sh | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/batman-adv-devel/files/etc/config/batman-adv b/batman-adv-devel/files/etc/config/batman-adv
index f38855e..be97065 100644
--- a/batman-adv-devel/files/etc/config/batman-adv
+++ b/batman-adv-devel/files/etc/config/batman-adv
@@ -16,6 +16,7 @@ config 'mesh' 'bat0'
option 'network_coding'
option 'hop_penalty'
option 'isolation_mark'
+ option 'routing_algo'
# yet another batX instance
# config 'mesh' 'bat5'
diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh
index 632a209..cbdb019 100644
--- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh
+++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh
@@ -6,15 +6,20 @@ init_proto "$@"
proto_batadv_init_config() {
proto_config_add_string "mesh"
+ proto_config_add_string "routing_algo"
}
proto_batadv_setup() {
local config="$1"
local iface="$2"
- local mesh
- json_get_vars mesh
+ local mesh routing_algo
+ json_get_vars mesh routing_algo
+ [ -n "$routing_algo" ] || routing_algo="BATMAN_IV"
+ echo "$routing_algo" > "/sys/module/batman_adv/parameters/routing_algo"
+
+ uci get batman_adv.$mesh.routing_algo
echo "$mesh" > "/sys/class/net/$iface/batman_adv/mesh_iface"
proto_init_update "$iface" 1
proto_send_update "$config"
7 years
[batman-adv] next: batman-adv: Ignore temporary files in git-status/git-add/... (d5e8ba8)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
>---------------------------------------------------------------
commit d5e8ba80a27c5bbdef018343ffa4adccc23f6da9
Author: Sven Eckelmann <sven(a)open-mesh.com>
Date: Wed Jan 20 16:44:25 2016 +0100
batman-adv: Ignore temporary files in git-status/git-add/...
Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
d5e8ba80a27c5bbdef018343ffa4adccc23f6da9
.gitattributes | 2 ++
.gitignore | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..eeef3e0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+/.gitignore export-ignore
+/.gitattributes export-ignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..59c6a30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/compat-autoconf.h
+/compat-autoconf.h.tmp
+/net/batman-adv/.*
+/net/batman-adv/batman-adv.ko
+/net/batman-adv/batman-adv.mod.c
+/net/batman-adv/modules.order
+/net/batman-adv/Module.symvers
+/net/batman-adv/*.o
7 years
[batctl] next: batctl: Ignore temporary files in git-status/git-add/... (7a3d563)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batctl
On branch : next
>---------------------------------------------------------------
commit 7a3d563466f368b9b50191f441b775bae46a77ca
Author: Sven Eckelmann <sven(a)open-mesh.com>
Date: Wed Jan 20 16:43:57 2016 +0100
batctl: Ignore temporary files in git-status/git-add/...
Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
7a3d563466f368b9b50191f441b775bae46a77ca
.gitattributes | 2 ++
.gitignore | 3 +++
2 files changed, 5 insertions(+)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..eeef3e0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+/.gitignore export-ignore
+/.gitattributes export-ignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8f1d328
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/*.d
+/*.o
+/batctl
7 years
[batman-adv] next: batman-adv: Add compat code for BUILD_BUG_ON_NOT_POWER_OF_2 (a23e9a9)
by postmaster@open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : next
>---------------------------------------------------------------
commit a23e9a9ffbb38037bec60223f0377636f78763f0
Author: Sven Eckelmann <sven(a)open-mesh.com>
Date: Wed Jan 20 19:00:15 2016 +0100
batman-adv: Add compat code for BUILD_BUG_ON_NOT_POWER_OF_2
Fixes: 2c2fe0ba9ea5 ("batman-adv: ELP - creating neighbor structures")
Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
a23e9a9ffbb38037bec60223f0377636f78763f0
compat-include/linux/average.h | 2 ++
compat-include/linux/bug.h | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h
index e5a2bf5..631df9b 100644
--- a/compat-include/linux/average.h
+++ b/compat-include/linux/average.h
@@ -26,6 +26,8 @@
#include_next <linux/average.h>
#endif
+#include <linux/bug.h>
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
/* Exponentially weighted moving average (EWMA) */
diff --git a/compat-include/linux/bug.h b/compat-include/linux/bug.h
index 124fd28..0c46158 100644
--- a/compat-include/linux/bug.h
+++ b/compat-include/linux/bug.h
@@ -24,6 +24,19 @@
#include <linux/version.h>
#include_next <linux/bug.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
+
+#undef BUILD_BUG_ON_NOT_POWER_OF_2
+#ifdef __CHECKER__
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0)
+#else
+/* Force a compilation error if a constant expression is not a power of 2 */
+#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \
+ BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0))
+#endif
+
+#endif /* < KERNEL_VERSION(2, 6, 33) */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
#undef BUILD_BUG_ON
7 years