commits May 2016

commits@lists.open-mesh.org

1 participants
174 discussions

[batman-adv] maint: batman-adv: Add missing include for batadv_v_neigh_is_sob (9685688)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 9685688ae7dd85804aec2f6ce760611551fe9635 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 7 09:50:44 2016 +0200 batman-adv: Add missing include for batadv_v_neigh_is_sob batadv_v_neigh_is_sob started to use false which is defined in linux/stddef.h. Fixes: 036aa7b7181e ("batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sob") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9685688ae7dd85804aec2f6ce760611551fe9635 net/batman-adv/bat_v.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 0caca2f..1f960c9 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -27,6 +27,7 @@ #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h> +#include <linux/stddef.h> #include <linux/types.h> #include <linux/workqueue.h>

1 0

[openwrt-feed-devel] master: batctl-devel: allow configuring the branch/tag via menuconfig (ae1dbbe)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit ae1dbbeffda76c3c44d3552f31c2953a799b196a Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun May 8 06:09:33 2016 +0800 batctl-devel: allow configuring the branch/tag via menuconfig Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ae1dbbeffda76c3c44d3552f31c2953a799b196a batctl-devel/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index 1ffb88a..3530471 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl-devel -PKG_BRANCH:=master +PKG_BRANCH:=$(call qstrip,$(CONFIG_BATCTL_DEVEL_BATCTL_BRANCH)) PKG_VERSION:=$(shell git ls-remote https://git@git.open-mesh.org/batctl.git $(PKG_BRANCH) | cut -c1-7) PKG_BATCTL_FNAME:=batctl-devel-$(PKG_VERSION).tar.gz PKG_BATCTL_DIR:=batctl-$(PKG_VERSION) @@ -37,6 +37,18 @@ additional tools for debugging as well. This package builds the latest development version ($(PKG_VERSION)). endef +define Package/batctl-devel/config + config BATCTL_DEVEL_BATCTL_BRANCH + string + prompt "batctl branch to build package with" + depends on PACKAGE_batctl-devel + default "master" + help + Enter a batctl branch name or git tag to override package + default value. This allows to build from non-master branches + to test unreleased features. +endef + # The linker can identify unused sections of a binary when each symbol is stored # in a separate section. This mostly removes unused linker sections and reduces # the size by ~3% on mipsel.

1 0

[openwrt-feed-devel] master: alfred-devel: allow configuring the branch/tag via menuconfig (baf08c7)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit baf08c7ff10b5b3132b6d1a86fed700855d7560b Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun May 8 05:55:46 2016 +0800 alfred-devel: allow configuring the branch/tag via menuconfig Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- baf08c7ff10b5b3132b6d1a86fed700855d7560b alfred-devel/Config.in | 10 ++++++++++ alfred-devel/Makefile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/alfred-devel/Config.in b/alfred-devel/Config.in index 98c409b..5cf1a85 100644 --- a/alfred-devel/Config.in +++ b/alfred-devel/Config.in @@ -20,3 +20,13 @@ config PACKAGE_ALFRED_DEVEL_GPSD depends on PACKAGE_alfred-devel select ALFRED_DEVEL_NEEDS_libgps default n + +config ALFRED_DEVEL_ALFRED_BRANCH + string + prompt "alfred branch to build package with" + depends on PACKAGE_alfred-devel + default "master" + help + Enter an alfred branch name or git tag to override package + default value. This allows to build from non-master branches + to test unreleased features. diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index df52b2a..7a5cb52 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred-devel -PKG_BRANCH:=master +PKG_BRANCH:=$(call qstrip,$(CONFIG_ALFRED_DEVEL_ALFRED_BRANCH)) PKG_VERSION:=$(shell git ls-remote https://git@git.open-mesh.org/alfred.git $(PKG_BRANCH) | cut -c1-7) PKG_ALFRED_FNAME:=alfred-devel-$(PKG_VERSION).tar.gz PKG_ALFRED_DIR:=alfred-$(PKG_VERSION)

1 0

[openwrt-feed-devel] master: alfred-devel: remove unused init-y (d7d3cdc)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit d7d3cdc3b09dca9b4b32bc1cb76d2666d7ea031d Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun May 8 05:57:34 2016 +0800 alfred-devel: remove unused init-y Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d7d3cdc3b09dca9b4b32bc1cb76d2666d7ea031d alfred-devel/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index 7a5cb52..c8dc640 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -21,8 +21,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_ALFRED_DIR) include $(INCLUDE_DIR)/package.mk -init-y := alfred - define Package/alfred-devel SECTION:=net CATEGORY:=Network

1 0

[batman-adv] master: Merge branch 'next' (4e90f56)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 4e90f564b1049a091604ba64f2943ebde8f2c59b Merge: 586d838 f808f18 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat May 7 20:36:38 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 4e90f564b1049a091604ba64f2943ebde8f2c59b net/batman-adv/bat_v.c | 10 ++++++++++ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++--------- net/batman-adv/bat_v_elp.h | 2 ++ 3 files changed, 34 insertions(+), 9 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (4e90f56)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: f58a0b0 batman-adv: initialize ELP orig address on secondary interfaces f808f18 Merge branch 'maint' into next 4e90f56 Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (f808f18)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit f808f1877a5abaf990e6c21daf63edadac849676 Merge: 5d36bde f58a0b0 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat May 7 20:32:53 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- f808f1877a5abaf990e6c21daf63edadac849676 net/batman-adv/bat_v.c | 10 ++++++++++ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++--------- net/batman-adv/bat_v_elp.h | 2 ++ 3 files changed, 34 insertions(+), 9 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (f808f18)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: f58a0b0 batman-adv: initialize ELP orig address on secondary interfaces f808f18 Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: initialize ELP orig address on secondary interfaces (f58a0b0)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit f58a0b03873fd3aa9568c11af198f997ed2208cc Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat May 7 19:54:17 2016 +0800 batman-adv: initialize ELP orig address on secondary interfaces This fix prevents nodes to wrongly create a 00:00:00:00:00:00 originator which can potentially interfere with the rest of the neighbor statistics. Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f58a0b03873fd3aa9568c11af198f997ed2208cc net/batman-adv/bat_v.c | 10 ++++++++++ net/batman-adv/bat_v_elp.c | 31 ++++++++++++++++++++++--------- net/batman-adv/bat_v_elp.h | 2 ++ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 2bcb29b..0caca2f 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -39,6 +39,16 @@ static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface) { + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + struct batadv_hard_iface *primary_if; + + primary_if = batadv_primary_if_get_selected(bat_priv); + + if (primary_if) { + batadv_v_elp_iface_activate(primary_if, hard_iface); + batadv_hardif_put(primary_if); + } + /* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can * set the interface as ACTIVE right away, without any risk of race * condition diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 3844e7e..df42eb1 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -377,6 +377,27 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) } /** + * batadv_v_elp_iface_activate - update the ELP buffer belonging to the given + * hard-interface + * @primary_iface: the new primary interface + * @hard_iface: interface holding the to-be-updated buffer + */ +void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, + struct batadv_hard_iface *hard_iface) +{ + struct batadv_elp_packet *elp_packet; + struct sk_buff *skb; + + if (!hard_iface->bat_v.elp_skb) + return; + + skb = hard_iface->bat_v.elp_skb; + elp_packet = (struct batadv_elp_packet *)skb->data; + ether_addr_copy(elp_packet->orig, + primary_iface->net_dev->dev_addr); +} + +/** * batadv_v_elp_primary_iface_set - change internal data to reflect the new * primary interface * @primary_iface: the new primary interface @@ -384,8 +405,6 @@ void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface) void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface) { struct batadv_hard_iface *hard_iface; - struct batadv_elp_packet *elp_packet; - struct sk_buff *skb; /* update orig field of every elp iface belonging to this mesh */ rcu_read_lock(); @@ -393,13 +412,7 @@ void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface) if (primary_iface->soft_iface != hard_iface->soft_iface) continue; - if (!hard_iface->bat_v.elp_skb) - continue; - - skb = hard_iface->bat_v.elp_skb; - elp_packet = (struct batadv_elp_packet *)skb->data; - ether_addr_copy(elp_packet->orig, - primary_iface->net_dev->dev_addr); + batadv_v_elp_iface_activate(primary_iface, hard_iface); } rcu_read_unlock(); } diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index e95f1bc..cc130b2 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -25,6 +25,8 @@ struct work_struct; int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface); void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface); +void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, + struct batadv_hard_iface *hard_iface); void batadv_v_elp_primary_iface_set(struct batadv_hard_iface *primary_iface); int batadv_v_elp_packet_recv(struct sk_buff *skb, struct batadv_hard_iface *if_incoming);

1 0

[batman-adv] master: Merge branch 'next' (586d838)
by postmaster＠open-mesh.org 07 May '16

07 May '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 586d83871426e3ce5ef46a61e116a8aec9ba04cc Merge: 3668e7c 5d36bde Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat May 7 20:16:00 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 586d83871426e3ce5ef46a61e116a8aec9ba04cc

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2016