commits January 2015

commits@lists.open-mesh.org

1 participants
47 discussions

[linux-merge]linux integration; annotated tag, v3.19-rc3, created. v3.19-rc3
by postmaster＠open-mesh.org 06 Jan '15

06 Jan '15

The annotated tag, v3.19-rc3 has been created at 1746eaa6b7f74b6a25d43fd57f51b6bf0fafaeae (tag) tagging b1940cd21c0f4abdce101253e860feff547291b0 (commit) replaces v3.19-rc2 tagged by Linus Torvalds on Mon Jan 5 17:05:36 2015 -0800 - Shortlog ------------------------------------------------------------ Linux 3.19-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUqzTgAAoJEHm+PkMAQRiGaGIH/3n0tkPXN/QUuwkEunn25UkO h/6VlIbzTIk0C2Dj87b2M3aZwQQ0mnSsbYk1YDFKzUGaH0NkLiEUlWDFnrki4Ypm fHhgPcJql59rUysaSzQgggIJ3cYhoWerRFIw9RGF4jxarnywnNi2OVbFh/rmv+/j fTgu7gXGNWYs3ZHafn7jcKKcJBI1YWubg6hymC4oH3eP/TDH29OXKSXghaaVDvvO dC91utQlqzT0upAo+lXheaj+JjPB2xub1v6RV9k1kpGhvWlxpFJqoq/BWlSlrTLw CpI9UcVYI5XC+BUsHEDVJMDc5qysAf4p89vW4ArrJ4aTvx+N7WswCq7aqkHtR1Q= =Covb -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: avoid NULL dereferences and fix if check Sven Eckelmann (2): batman-adv: Calculate extra tail size based on queued fragments batman-adv: Unify fragment size calculation ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 06 Jan '15

06 Jan '15

The annotated tag, batman-adv-fix-for-davem has been updated to f978ebb9b4a85b490059c6c3464a685651029b43 (tag) from bad92a7e9fb9fac8d30e4adaed8943430bd0a90c (which is now obsolete) tagging 9d31b3ce81683ce3c9fd10afa70892e373b21067 (commit) replaces v3.19-rc2 tagged by Antonio Quartulli on Tue Jan 6 11:07:36 2015 +0100 - Shortlog ------------------------------------------------------------ Included changes: - ensure bonding is used (if enabled) for packets coming in the soft interface - fix race condition to avoid orig_nodes to be deleted right after being added - avoid false positive lockdep splats by assigning lockclass to the proper hashtable lock objects - avoid miscounting of multicast 'disabled' nodes in the network - fix memory leak in the Global Translation Table in case of originator interval change -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJUq7PtAAoJEJgn97Bh2u9ejD0P/AqFX7KAqlzEZo7SSIwduX/e OLUWJyplATljKAwmTM+gFxyTC6HOUhqG/0UZpUu83OA0uC5HmT2ATJXUal1vG8uN ewfxqhsnz8UMxmjENcjsExGdhjW0CDeD+lRdxPGbbq5vEbqe9dXXr4HVAlJFGhnX fzR65WB2om9BTYMgIWmZutRjP9VTPArgOCKtCgLclHut19VXmZDALPWZ5S6kPfUG O9fSPi0uzr7WIy6p+5XCi69pw+rlHv23A3soXK9G4Ze+ET2QcQSgkL6Q3VJ2+uMV wBzTahRN7sJgJ8GYBDrhXgw3yRl2FkjLNPav3+gOnbK0+PycrnGiC1YPbX8w/cpr EHyFB/kZCeBusPaRQAYP91YI3cYJ3Onq3kjbUPVV+ASMoJ/vdVORRjDHY8ALf12w uGp/+9aAEJYqAOZhVZKTofTgfT3ULQycd+Ffi/0LC8OLaKQeqdEcmGRrIKNJmsP5 a+gsKEMe7QCbHkWAVnKLGKthLH4IRU98gVApS1nld9OE2yrPyywrA5ac353iFB1K Y/56RFAqU1nywv+hhArcCZymiOPxKyF+lK3VAHvnlFgMMJs5gNZzoGX7V7TODkiA yiZCuzOGsB4hPSdzf1KfCVR3LkFfaI2jGr7X+38OdK9WGMG2mcPEB0tyXr7uFuky V/VPJDENwQwmgfdR+D+3 =30sl -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: avoid NULL dereferences and fix if check Linus Lüssing (4): batman-adv: fix delayed foreign originator recognition batman-adv: fix counter for multicast supporting nodes batman-adv: fix multicast counter when purging originators batman-adv: fix potential TT client + orig-node memory leak Martin Hundebøll (1): batman-adv: fix lock class for decoding hash in network-coding.c Simon Wunderlich (1): batman-adv: fix and simplify condition when bonding should be used Sven Eckelmann (2): batman-adv: Calculate extra tail size based on queued fragments batman-adv: Unify fragment size calculation ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 06 Jan '15

06 Jan '15

The annotated tag, batman-adv-fix-for-davem has been created at bad92a7e9fb9fac8d30e4adaed8943430bd0a90c (tag) tagging 87ec8e3c8740dedaaeaf93f553ca133d13227083 (commit) replaces v3.19-rc2 tagged by Antonio Quartulli on Tue Jan 6 09:38:22 2015 +0100 - Shortlog ------------------------------------------------------------ Included changes: - ensure bonding is used (if enabled) for packets coming in the soft interface - fix race condition to avoid orig_nodes to be deleted right after being added - avoid false positive lockdep splats by assigning lockclass to the proper hashtable lock objects - avoid miscounting of multicast 'disabled' nodes in the network - fix memory leak in the Global Translation Table in case of originator interval change -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJUq7KwAAoJEJgn97Bh2u9ePUIP/RjnOMt1FvUZyOmPJAc5chOO Gme236Nw4epuGThBdizdp0nDll63vfDa5/vLlQACqwdqLrQLAoVygVl3m+/yyJn2 qQy4WB/yIgLug6qfp72SNmksrCEfksNwl1/xwk6Z7IHJqrY8vv2vmdbZuwyQzFKn oN/rtKc4g+qR+UyakafAHbpsMhH3WF9qTx9gUd9LzadSvV6KIbfP1oZmc8tPFSlh MjjsRsJlHEfrbyBa9BPBEWbCComaJwtz44lBo/eOR81ca5DXD2HnWbZuA/B9Ba8f 75gjc7FojlAPkFY2DjeBqBPRmrKvp1T3GIEYn+MTJGktYvVJAH0vYbZLuhsD6jj8 eBl1qHs8j/oX6HXkmPWDfR+kj+BnMSKF69jFQbbajHbVYeKt3gsi8nC3uX8n3Gy5 rAFsZIPDsBDGH9kYus7QydyVrju2+gE3jiwkoNIroHNMg6zrf8o8ktECqqnpsXyj /F/aA34wXN+Fg566f6ue64lcbJ0tJI9qLK74tTRG5ynMBo8qSCR5FK4h7xKlwKDG Xn+FlNppt5dHUZektvbGBxqpSUjUW4D9d2SKYdhGZQ66z851zhpRNsyiTeTC/zom vqi02XQy3j8JpBA30kB1hxi+v0HBh9FCDOuDlGhUxDZW1cLSa88sIiOA9OQIeQni +siW4dvyo4rrpN4+nzE7 =lGh2 -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: avoid NULL dereferences and fix if check Linus Lüssing (4): batman-adv: fix delayed foreign originator recognition batman-adv: fix counter for multicast supporting nodes batman-adv: fix multicast counter when purging originators batman-adv: fix potential TT client + orig-node memory leak Martin Hundebøll (1): batman-adv: fix lock class for decoding hash in network-coding.c Simon Wunderlich (1): batman-adv: fix and simplify condition when bonding should be used Sven Eckelmann (2): batman-adv: Calculate extra tail size based on queued fragments batman-adv: Unify fragment size calculation ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, deleted. v3.16-rc7-86-gd912426
by postmaster＠open-mesh.org 06 Jan '15

06 Jan '15

The annotated tag, batman-adv-fix-for-davem has been deleted was 98438c3fc66367ad2490069555f33bf04afb63e6 ----------------------------------------------------------------------- tag batman-adv-fix-for-davem Fix out-of-order fragments reception. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJT4IPwAAoJEJgn97Bh2u9e1VYP/3oZvI8BPNJaU6rv+KsACBPG A1JD6bx9x3msFUZmuZtjcAp6EPDQGsBfTnV8wq7NhtKds7xbK8X+G3rXAHoaeNiC awyWQ3shD0Ksi8Y0dIlXvRJK8xcaVF0X+G9yjtT5fokDSVraaPNntJEsX2r/5+Gw +wMnOe3AorZy2koBucmf8Q5xXqiAbMY4l2Fwx8HIzM70z04h9JwgQyf1Ji/uM/q4 s30wB5Omd+HY4TAbsbHe/Or7inT6qhqwWbitS13VK6V7765Tb3WCg19hDtYYX09p ZlLvqolBgwb5Ey4ZV/VaZ5erLdZ12wEfBAxYjem7JnHUyLKqr9KdLiv8i4/cNaLS lvTCIPD/RTtLmzKni6NpYxQ7WeB7533+4I+dg1ZfqtTuRMrZdaPQ7ER/QeR4/kV4 Ua88zJ9Zj9ffxsCKjyOf2Dw1dQtzfLJdvHBU5pJ9sC47RcLv0a+68dE2+kmbPdNY eLVxUAw1fMQhH4PyBRCJPncY79YLeM6eemMZhukc728/NfXVkfGXgNJlMpnD+dJE +yYSpYRd6/RjyXQUBhzDPyrsNNKiPP8flW/R11jdcSq8YSdPzvMWUHvXPTA/1d3C U9Qsf3aA+0wH4vtJ8G7klk8GmYxFZuYFNKwYVxVX9PQNzLCoVCNYENkPvjEz827C MGwkqrh44S/+5++12b9+ =CJDS -----END PGP SIGNATURE----- d9124268d84a836f14a6ead54ff9d8eee4c43be5 batman-adv: Fix out-of-order fragmentation support ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.19-rc2-2510-gf6ffcca
by postmaster＠open-mesh.org 06 Jan '15

06 Jan '15

The following commit has been merged in the merge/master branch: commit f6ffcca6c7faf21969a29d3ef7f05166340736fa Merge: e1b9cf4b021b60f664ece222c47b1c7b3c38d7d2 a918eb9fac6431901fe8ec8a2cb31dfe6fdd1af7 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Tue Jan 6 09:12:52 2015 +0100 Merge remote-tracking branch 'net-next/master' into merge/master Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Conflicts: net/batman-adv/main.h net/batman-adv/multicast.c net/batman-adv/send.c net/batman-adv/soft-interface.c diff --combined net/batman-adv/soft-interface.c index e783afb,5467955..cfc2cd2 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -106,7 -106,6 +106,7 @@@ static struct net_device_stats *batadv_ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) { struct batadv_priv *bat_priv = netdev_priv(dev); + struct batadv_softif_vlan *vlan; struct sockaddr *addr = p; uint8_t old_addr[ETH_ALEN]; @@@ -117,17 -116,12 +117,17 @@@ ether_addr_copy(dev->dev_addr, addr->sa_data); /* only modify transtable if it has been initialized before */ - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { - batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS, + if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) + return 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + batadv_tt_local_remove(bat_priv, old_addr, vlan->vid, "mac address changed", false); - batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS, + batadv_tt_local_add(dev, addr->sa_data, vlan->vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); } + rcu_read_unlock(); return 0; } @@@ -454,14 -448,14 +454,14 @@@ out * possibly free it * @softif_vlan: the vlan object to release */ -void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan) +void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan) { - if (atomic_dec_and_test(&vlan->refcount)) { - spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock); - hlist_del_rcu(&vlan->list); - spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock); + if (atomic_dec_and_test(&softif_vlan->refcount)) { + spin_lock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock); + hlist_del_rcu(&softif_vlan->list); + spin_unlock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock); - kfree_rcu(vlan, rcu); + kfree_rcu(softif_vlan, rcu); } } @@@ -757,7 -751,7 +757,7 @@@ static int batadv_softif_init_late(stru atomic_set(&bat_priv->gw.bandwidth_down, 100); atomic_set(&bat_priv->gw.bandwidth_up, 20); atomic_set(&bat_priv->orig_interval, 1000); - atomic_set(&bat_priv->hop_penalty, 15); + atomic_set(&bat_priv->hop_penalty, 30); #ifdef CONFIG_BATMAN_ADV_DEBUG atomic_set(&bat_priv->log_level, 0); #endif @@@ -933,7 -927,7 +933,7 @@@ struct net_device *batadv_softif_create int ret; soft_iface = alloc_netdev(sizeof(struct batadv_priv), name, - batadv_softif_init_early); + NET_NAME_UNKNOWN, batadv_softif_init_early); if (!soft_iface) return NULL; -- linux integration

1 0

[batctl] tag 'v2014.4.0' created
by postmaster＠open-mesh.org 05 Jan '15

05 Jan '15

Repository : ssh://git@open-mesh.org/batctl New tag : v2014.4.0 Referencing: 8e2ff6a0b695a4b701ff09a07576a8cd1c92079a

1 0

[alfred] tag 'v2014.4.0' created
by postmaster＠open-mesh.org 05 Jan '15

05 Jan '15

Repository : ssh://git@open-mesh.org/alfred New tag : v2014.4.0 Referencing: d062278b87aafd90ddcae5d374d5c969b29c73b3

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (03108de)
by postmaster＠open-mesh.org 05 Jan '15

05 Jan '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 03108de2b0f9a5f447efe45d0ad332fe40f7943e Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Dec 31 00:41:12 2014 +0100 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 03108de2b0f9a5f447efe45d0ad332fe40f7943e CHANGELOG | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5dcd0b5..2b0b043 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +alfred 2014.4.0: + + * add support for multiple interfaces per master + * add support for changing interfaces on the fly + * changes to support multiple alfred interfaces: + - bind alfred to a specific interface + - allow configuring the unix socket path + * enhanced debugging + + -- Wed, 31 Dec 2014 00:40:42 +0100 + alfred 2014.3.0: * fix various possible memleak, access errors and strncpy issues

1 0

[alfred] master: alfred: Start new development cycle (c402505)
by postmaster＠open-mesh.org 05 Jan '15

05 Jan '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit c40250526c56ab288f9afb812684cd1ffdb6320a Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Dec 31 00:42:31 2014 +0100 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- c40250526c56ab288f9afb812684cd1ffdb6320a alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index 05ac870..f758fc9 100644 --- a/alfred.h +++ b/alfred.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2014.4.0" +#define SOURCE_VERSION "2014.5" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index a8382ea..e287110 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -38,7 +38,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2014.4.0" +#define SOURCE_VERSION "2014.5" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 468bfc4..ac2afb5 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -27,7 +27,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2014.4.0" +#define SOURCE_VERSION "2014.5" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[batctl] master's head updated: Merge branch 'next' (6ee954f)
by postmaster＠open-mesh.org 05 Jan '15

05 Jan '15

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: fbd846b batctl: Start new development cycle 6ee954f Merge branch 'next'

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2015