commits July 2015

commits@lists.open-mesh.org

1 participants
42 discussions

[openwrt-feed-batman-adv] master: batctl-devel: update to latest master (ca6a836)
by postmaster＠open-mesh.org 17 Jul '15

17 Jul '15

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit ca6a83626afa1a5c9802f796275e42ab6a23ee7a Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Jul 17 18:54:25 2015 +0800 batctl-devel: update to latest master Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ca6a83626afa1a5c9802f796275e42ab6a23ee7a batctl-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index 13fd1f5..7d61513 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl-devel -PKG_VERSION:=1d48de5 +PKG_VERSION:=224b5e4 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)

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: remove quotes from ipk file name (ddc2216)
by postmaster＠open-mesh.org 17 Jul '15

17 Jul '15

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit ddc22169460ff0944470fc6980aaf99eba0191b6 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Jul 17 18:52:36 2015 +0800 batman-adv-devel: remove quotes from ipk file name Signed-off-by: Jo-Philipp Wich <jow(a)openwrt.org> >--------------------------------------------------------------- ddc22169460ff0944470fc6980aaf99eba0191b6 batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index bb234b2..9971e22 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv-devel -PKG_VERSION:=$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_REV) +PKG_VERSION:=$(call qstrip,$(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_REV)) PKG_BATMAN_SHORTREV:=$(shell echo $(PKG_VERSION) | cut -c1-7) PKG_BATMAN_FNAME:=batman-adv-devel-$(PKG_BATMAN_SHORTREV).tar.gz PKG_BATMAN_DIR:=batman-adv-$(PKG_BATMAN_SHORTREV)

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master and add support for BATMAN V (d6dd73e)
by postmaster＠open-mesh.org 17 Jul '15

17 Jul '15

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit d6dd73e412d41b420587be255780a02f5c5bc05c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Jul 17 18:42:44 2015 +0800 batman-adv-devel: update to latest master and add support for BATMAN V Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d6dd73e412d41b420587be255780a02f5c5bc05c batman-adv-devel/Config.in | 7 ++++++- batman-adv-devel/Makefile | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 9101d36..f648962 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -24,11 +24,16 @@ config KMOD_BATMAN_ADV_DEVEL_NC depends on PACKAGE_kmod-batman-adv-devel default n +config KMOD_BATMAN_ADV_DEVEL_BATMAN_V + bool "enable batman v routing algorithm" + depends on PACKAGE_kmod-batman-adv-devel + default n + 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 "c7cc2d4" + default "7da6fe1d" 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 34f4ba7..bb234b2 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -28,8 +28,10 @@ define KernelPackage/batman-adv-devel MAINTAINER:=Marek Lindner <mareklindner(a)neomailbox.ch> SUBMENU:=Network Support DEPENDS:=+KMOD_BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-crypto-core +kmod-crypto-crc32c +kmod-lib-crc32c + KCONFIG:=\ + CONFIG_AVERAGE=y TITLE:=B.A.T.M.A.N. Adv devel - FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) + FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) endef @@ -60,12 +62,13 @@ MAKE_BATMAN_ADV_ARGS += \ CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DAT),y,n) \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_MCAST),y,n) \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_NC),y,n) \ + CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \ REVISION="$(PKG_BATMAN_SHORTREV)" all define Build/Prepare $(call Build/Prepare/Default) $(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \ - $(PKG_BUILD_DIR)/main.h + $(PKG_BUILD_DIR)/net/batman-adv/main.h endef define Build/Compile

1 0

[linux-merge]linux integration; annotated tag, v4.2-rc2, created. v4.2-rc2
by postmaster＠open-mesh.org 13 Jul '15

13 Jul '15

The annotated tag, v4.2-rc2 has been created at 7e67591243ec4ae951e69811b6b155c2c2ca8447 (tag) tagging bc0195aad0daa2ad5b0d76cce22b167bc3435590 (commit) replaces v4.2-rc1 tagged by Linus Torvalds on Sun Jul 12 15:10:36 2015 -0700 - Shortlog ------------------------------------------------------------ Linux 4.2-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVouXcAAoJEHm+PkMAQRiGjWQIAJcfwb9z5U8jCR+FyvqqM//U gzKdODPpwuJBa4IpQoCIZlT4wbGH3W0euuVKWk2zv9f+D/i5D/ZIAj0Wt5mjs1Z2 /uhEMnYskGHn7Q3HCQyyjPqTi6I4DnSiFS880xTQhsufXxtpDmVWETO1fyCvlt73 NU6Y0Y/Oe+tN5/Qp3wKLUaZMigiiBD5GviGQQNHtJ6UIorOCJnw5mYSx0dWPotIL SYUno4WIR/48FKABUDxs13YK7JDLv3w4h8FimvY+cY6hKLZ9zUhFUCCE3OKXcpHQ auAKhyi9YcqJxWvVUCl1gV8NmBefETp6zfWf07NBaDnFiNsfW+mqfO0mWwnOT5s= =C7m8 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master's head updated: Merge branch 'next' (7da6fe1)
by postmaster＠open-mesh.org 13 Jul '15

13 Jul '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 02008ee batman-adv: Fix potentially broken skb network header access 8592db1 Merge branch 'maint' into next 7da6fe1 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (7da6fe1)
by postmaster＠open-mesh.org 13 Jul '15

13 Jul '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 7da6fe1da1d3210fc700dd4db1951b64aa249e4b Merge: d5e1bbd 8592db1 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jul 13 11:15:37 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 7da6fe1da1d3210fc700dd4db1951b64aa249e4b net/batman-adv/soft-interface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[batman-adv] next: Merge branch 'maint' into next (8592db1)
by postmaster＠open-mesh.org 13 Jul '15

13 Jul '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 8592db1918a00a5daeb4aab946b599204b15731a Merge: a8c7689 02008ee Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jul 13 11:14:39 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 8592db1918a00a5daeb4aab946b599204b15731a net/batman-adv/soft-interface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (8592db1)
by postmaster＠open-mesh.org 13 Jul '15

13 Jul '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 02008ee batman-adv: Fix potentially broken skb network header access 8592db1 Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: Fix potentially broken skb network header access (02008ee)
by postmaster＠open-mesh.org 13 Jul '15

13 Jul '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 02008ee7543a6da10b7d8c648701f031da034365 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Jun 30 23:45:26 2015 +0200 batman-adv: Fix potentially broken skb network header access The two commits noted below added calls to ip_hdr() and ipv6_hdr(). They need a correctly set skb network header. Unfortunately we cannot rely on the device drivers to set it for us. Therefore setting it in the beginning of the according ndo_start_xmit handler. Fixes: 405cc1e5 ("batman-adv: Modified forwarding behaviour for multicast packets") Fixes: 1c090349 ("batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 02008ee7543a6da10b7d8c648701f031da034365 soft-interface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 7841a4b..eb87fd9 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -178,6 +178,7 @@ static int batadv_interface_tx(struct sk_buff *skb, int gw_mode; enum batadv_forw_mode forw_mode; struct batadv_orig_node *mcast_single_orig = NULL; + int network_offset = ETH_HLEN; if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dropped; @@ -190,14 +191,18 @@ static int batadv_interface_tx(struct sk_buff *skb, case ETH_P_8021Q: vhdr = vlan_eth_hdr(skb); - if (vhdr->h_vlan_encapsulated_proto != ethertype) + if (vhdr->h_vlan_encapsulated_proto != ethertype) { + network_offset += VLAN_HLEN; break; + } /* fall through */ case ETH_P_BATMAN: goto dropped; } + skb_set_network_header(skb, network_offset); + if (batadv_bla_tx(bat_priv, skb, vid)) goto dropped;

1 0

[batman-adv] master: batman-adv: Add compat code for lockdep_assert_held (d5e1bbd)
by postmaster＠open-mesh.org 10 Jul '15

10 Jul '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d5e1bbd456cdc4762d6ce5a6c45e890ef3a7b0d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 21 15:23:04 2015 +0200 batman-adv: Add compat code for lockdep_assert_held Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d5e1bbd456cdc4762d6ce5a6c45e890ef3a7b0d5 compat-include/linux/{slab.h => lockdep.h} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compat-include/linux/slab.h b/compat-include/linux/lockdep.h similarity index 71% copy from compat-include/linux/slab.h copy to compat-include/linux/lockdep.h index 276d678..e646114 100644 --- a/compat-include/linux/slab.h +++ b/compat-include/linux/lockdep.h @@ -18,16 +18,16 @@ * of the Linux kernel. */ -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ #include <linux/version.h> -#include_next <linux/slab.h> +#include_next <linux/lockdep.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) -#define kmalloc_array(n, size, flags) kmalloc(n * size, flags) +#define lockdep_assert_held(l) do { (void)(l); } while (0) -#endif /* < KERNEL_VERSION(3, 4, 0) */ +#endif /* < KERNEL_VERSION(2, 6, 32) */ -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SLAB_H_ */ +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_LOCKDEP_H_ */

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2015