commits June 2016

commits@lists.open-mesh.org

1 participants
134 discussions

[batman-adv] master: batman-adv: remove unused vid local variable in tt seq print (8f24d93)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8f24d93c8ec9524462bbaa055bf0077687a5bb11 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Fri May 20 20:42:19 2016 +0200 batman-adv: remove unused vid local variable in tt seq print Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 8f24d93c8ec9524462bbaa055bf0077687a5bb11 net/batman-adv/translation-table.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 9a2faf1..79d4e62 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -998,7 +998,6 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) struct batadv_tt_local_entry *tt_local; struct batadv_hard_iface *primary_if; struct hlist_head *head; - unsigned short vid; u32 i; int last_seen_secs; int last_seen_msecs; @@ -1025,7 +1024,6 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) tt_local = container_of(tt_common_entry, struct batadv_tt_local_entry, common); - vid = tt_common_entry->vid; last_seen_jiffies = jiffies - tt_local->last_seen; last_seen_msecs = jiffies_to_msecs(last_seen_jiffies); last_seen_secs = last_seen_msecs / 1000;

1 0

[batman-adv] master: batman-adv: Ignore auto-generated files in compat-sources (4833d11)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 4833d11822d443259bee7e7f8f4ca1a17d7b6767 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Wed May 18 11:58:52 2016 +0200 batman-adv: Ignore auto-generated files in compat-sources Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4833d11822d443259bee7e7f8f4ca1a17d7b6767 .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 59c6a30..4c03561 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /compat-autoconf.h /compat-autoconf.h.tmp +/compat-sources/**/.* +/compat-sources/**/*.o /net/batman-adv/.* /net/batman-adv/batman-adv.ko /net/batman-adv/batman-adv.mod.c

1 0

[batman-adv] master: Merge branch 'next' (0681847)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 06818470d4b84f6b6fa82d44795665fde393240e Merge: 0a5c1a8 144c829 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 6 23:57:21 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 06818470d4b84f6b6fa82d44795665fde393240e Makefile | 11 ++++++++--- net/batman-adv/soft-interface.c | 9 +++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --cc Makefile index 365a7cc,2568fb2..725c70b --- a/Makefile +++ b/Makefile @@@ -43,9 -43,8 +43,9 @@@ RM ?= rm - REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) - export NOSTDINC_FLAGS := \ + NOSTDINC_FLAGS += \ -I$(PWD)/compat-include/ \ + -I$(PWD)/include/ \ -include $(PWD)/compat.h \ $(CFLAGS) @@@ -53,12 -52,12 +53,17 @@@ ifneq ($(REVISION), NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" endif +include $(PWD)/compat-sources/Makefile + + obj-y += net/batman-adv/ + +export batman-adv-y + ++ BUILD_FLAGS := \ - M=$(PWD)/net/batman-adv \ + M=$(PWD) \ + PWD=$(PWD) \ + REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ CONFIG_BATMAN_ADV_BLA=$(CONFIG_BATMAN_ADV_BLA) \

1 0

[batman-adv] master's head updated: Merge branch 'next' (0681847)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: e721749 batman-adv: Clean up untagged vlan when destroying via rtnl-link f8fd441 batman-adv: Fix build against recent Debian Stretch kernels 144c829 Merge branch 'maint' into next 0681847 Merge branch 'next'

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (144c829)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: e721749 batman-adv: Clean up untagged vlan when destroying via rtnl-link f8fd441 batman-adv: Fix build against recent Debian Stretch kernels 144c829 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (144c829)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 144c829015fdb7c8847e15d7c4efaf5562562058 Merge: 6c27cef f8fd441 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 6 23:48:29 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 144c829015fdb7c8847e15d7c4efaf5562562058 Makefile | 10 +++++++--- net/batman-adv/soft-interface.c | 9 +++++++++ 2 files changed, 16 insertions(+), 3 deletions(-)

1 0

[batman-adv] maint: batman-adv: Fix build against recent Debian Stretch kernels (f8fd441)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit f8fd441e1e30f3a274c9bf44cc33372d4065cbb6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 28 10:32:48 2016 +0200 batman-adv: Fix build against recent Debian Stretch kernels The kernels for Debian stretch require some special CFLAGS settings which are only correctly defined when NOSTDINC_FLAGS is defined inside the execution of the Makefile via kbuild. But batman-adv sets it currently outside to insert compatibility include headers and compat-sources. This can be avoided by making the top Makefile kbuild compatible and redefining the NOSTDINC_FLAGS when kbuild include this Makefile. The actual build of the batman-adv module is then done by adding the subdirectory to obj-y. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Tested-by: Martin Weinelt <martin(a)darmstadt.freifunk.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f8fd441e1e30f3a274c9bf44cc33372d4065cbb6 Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5d2c058..2568fb2 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ RM ?= rm -f REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) -export NOSTDINC_FLAGS := \ +NOSTDINC_FLAGS += \ -I$(PWD)/compat-include/ \ -include $(PWD)/compat.h \ $(CFLAGS) @@ -52,8 +52,12 @@ ifneq ($(REVISION),) NOSTDINC_FLAGS += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" endif +obj-y += net/batman-adv/ + BUILD_FLAGS := \ - M=$(PWD)/net/batman-adv \ + M=$(PWD) \ + PWD=$(PWD) \ + REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ CONFIG_BATMAN_ADV_BLA=$(CONFIG_BATMAN_ADV_BLA) \ @@ -61,7 +65,7 @@ BUILD_FLAGS := \ CONFIG_BATMAN_ADV_NC=$(CONFIG_BATMAN_ADV_NC) \ CONFIG_BATMAN_ADV_MCAST=$(CONFIG_BATMAN_ADV_MCAST) \ CONFIG_BATMAN_ADV_BATMAN_V=$(CONFIG_BATMAN_ADV_BATMAN_V) \ - INSTALL_MOD_DIR=updates/net/batman-adv/ + INSTALL_MOD_DIR=updates/ all: config $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules

1 0

[batman-adv] maint: batman-adv: Clean up untagged vlan when destroying via rtnl-link (e721749)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit e721749d57ff57d6df4017d62797626eab9902f1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 28 14:38:26 2016 +0200 batman-adv: Clean up untagged vlan when destroying via rtnl-link The untagged vlan object is only destroyed when the interface is removed via the legacy sysfs interface. But it also has to be destroyed when the standard rtnl-link interface is used. Fixes: 952cebb57518 ("batman-adv: add per VLAN interface attribute framework") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e721749d57ff57d6df4017d62797626eab9902f1 net/batman-adv/soft-interface.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 8a136b6..3710620 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1017,7 +1017,9 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface) static void batadv_softif_destroy_netlink(struct net_device *soft_iface, struct list_head *head) { + struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_hard_iface *hard_iface; + struct batadv_softif_vlan *vlan; list_for_each_entry(hard_iface, &batadv_hardif_list, list) { if (hard_iface->soft_iface == soft_iface) @@ -1025,6 +1027,13 @@ static void batadv_softif_destroy_netlink(struct net_device *soft_iface, BATADV_IF_CLEANUP_KEEP); } + /* destroy the "untagged" VLAN */ + vlan = batadv_softif_vlan_get(bat_priv, BATADV_NO_FLAGS); + if (vlan) { + batadv_softif_destroy_vlan(bat_priv, vlan); + batadv_softif_vlan_put(vlan); + } + batadv_sysfs_del_meshif(soft_iface); unregister_netdevice_queue(soft_iface, head); }

1 0

[batman-adv] master's head updated: Merge branch 'next' (0a5c1a8)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: f6c80c2 batman-adv: Fix ICMP RR ethernet access after skb_linearize 6c27cef Merge branch 'maint' into next 0a5c1a8 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (0a5c1a8)
by postmaster＠open-mesh.org 06 Jun '16

06 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0a5c1a8f7b619cfe3bf0a0480dd05ba8341e4acb Merge: d947cc0 6c27cef Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jun 6 23:40:54 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 0a5c1a8f7b619cfe3bf0a0480dd05ba8341e4acb net/batman-adv/routing.c | 1 + 1 file changed, 1 insertion(+)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2016