commits June 2016

commits@lists.open-mesh.org

1 participants
134 discussions

[batman-adv] master: batman-adv: Document optional batadv_algo_ops (d6f42a6)
by postmaster＠open-mesh.org 13 Jun '16

13 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d6f42a67c28511228626a00b04f66917c06868ff Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 7 22:44:53 2016 +0200 batman-adv: Document optional batadv_algo_ops Some operations in batadv_algo_ops are optional and marked as such in the kerneldoc. But some of them miss the "(optional)" in their kerneldoc. These have to also be marked to give an implementor of an algorithm the correct background information without looking in the code calling these function pointers. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d6f42a67c28511228626a00b04f66917c06868ff net/batman-adv/types.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 43db7b6..0eeb68f 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1392,6 +1392,7 @@ struct batadv_forw_packet { /** * struct batadv_algo_iface_ops - mesh algorithm callbacks (interface specific) * @activate: start routing mechanisms when hard-interface is brought up + * (optional) * @enable: init routing info when hard-interface is enabled * @disable: de-init routing info when hard-interface is disabled * @update_mac: (re-)init mac addresses of the protocol information @@ -1409,6 +1410,7 @@ struct batadv_algo_iface_ops { /** * struct batadv_algo_neigh_ops - mesh algorithm callbacks (neighbour specific) * @hardif_init: called on creation of single hop entry + * (optional) * @cmp: compare the metrics of two neighbors for their respective outgoing * interfaces * @is_similar_or_better: check if neigh1 is equally similar or better than @@ -1431,11 +1433,11 @@ struct batadv_algo_neigh_ops { /** * struct batadv_algo_orig_ops - mesh algorithm callbacks (originator specific) * @free: free the resources allocated by the routing algorithm for an orig_node - * object + * object (optional) * @add_if: ask the routing algorithm to apply the needed changes to the - * orig_node due to a new hard-interface being added into the mesh + * orig_node due to a new hard-interface being added into the mesh (optional) * @del_if: ask the routing algorithm to apply the needed changes to the - * orig_node due to an hard-interface being removed from the mesh + * orig_node due to an hard-interface being removed from the mesh (optional) * @print: print the originator table (optional) */ struct batadv_algo_orig_ops {

1 0

[batctl] master's head updated: batctl: Fix format string for raw tp_meter output (53081ce)
by postmaster＠open-mesh.org 13 Jun '16

13 Jun '16

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 53081ce batctl: Fix format string for raw tp_meter output

1 0

[batctl] next: batctl: Fix format string for raw tp_meter output (53081ce)
by postmaster＠open-mesh.org 13 Jun '16

13 Jun '16

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 53081cebda475f434b5383a5fc6c24be0ba9577b Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 20 17:30:08 2016 +0200 batctl: Fix format string for raw tp_meter output The tp_meter output for raw bytes is not casting the values to float. It must therefore use PRIu64 to print the results. Reported-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> >--------------------------------------------------------------- 53081cebda475f434b5383a5fc6c24be0ba9577b tp_meter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tp_meter.c b/tp_meter.c index d980ebd..43c19da 100644 --- a/tp_meter.c +++ b/tp_meter.c @@ -524,8 +524,8 @@ int tp_meter(char *mesh_iface, int argc, char **argv) (float)throughput / (1<<10), (float)throughput * 8 / 1000); else - printf("%lu Bytes/s (%lu Bps)\n", - throughput, throughput * 8); + printf("%" PRIu64 " Bytes/s (%" PRIu64 " Bps)\n", + throughput, throughput * 8); ret = 0; break;

1 0

[batman-adv] master: batman-adv: Fix hardif remove/add race (6b0485c)
by postmaster＠open-mesh.org 13 Jun '16

13 Jun '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 6b0485c758be31ff3d466644975eaedc54db6d17 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Tue May 17 15:39:27 2016 +0200 batman-adv: Fix hardif remove/add race A hard interface can be removed and then added back in quick succession. This is particularly true for hdlc interface when changing the protocol. It is not possible it synchronously remove the sysfs and debugfs entries for the hard interface when it is removed because the files may be open. Thus removal is deferred. The files may thus already exist in sysfs and debugfs when the hard interface is re-added, and the operations fail. To fix this race, synchronously rename the debugfs and sysfs files to a unique temporary name, thus making the name available when the interface comes back, yet keeps open files still available. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 6b0485c758be31ff3d466644975eaedc54db6d17 net/batman-adv/debugfs.c | 23 +++++++++++++++++++++++ net/batman-adv/debugfs.h | 1 + net/batman-adv/hard-interface.c | 19 +++++++++++++++++++ net/batman-adv/sysfs.c | 17 +++++++++++++++++ net/batman-adv/sysfs.h | 2 ++ 5 files changed, 62 insertions(+) diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 1d68b6e..aea4133 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -44,6 +44,7 @@ #include "translation-table.h" static struct dentry *batadv_debugfs; +static atomic_t batadv_rename = ATOMIC_INIT(0); static int batadv_algorithms_open(struct inode *inode, struct file *file) { @@ -347,6 +348,28 @@ void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface) } } +/** + * batadv_debugfs_rename_hardif - rename the base directory + * @hard_iface: hard interface which is renamed. + * + * The interface may be removed and then quickly added back + * again. Rename the old instance to something temporary and unique, + * so avoiding a name space clash if it does reappear before the deferred + * work completes the removal. + */ +void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface) +{ + char new_name[32]; + + snprintf(new_name, sizeof(*new_name) - 1, "tmp-%d", + atomic_inc_return(&batadv_rename)); + + if (batadv_debugfs && hard_iface->debug_dir) { + debugfs_rename(batadv_debugfs, hard_iface->debug_dir, + batadv_debugfs, new_name); + } +} + int batadv_debugfs_add_meshif(struct net_device *dev) { struct batadv_priv *bat_priv = netdev_priv(dev); diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 1ab4e2e..e7d19c1 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -34,6 +34,7 @@ int batadv_debugfs_add_meshif(struct net_device *dev); void batadv_debugfs_del_meshif(struct net_device *dev); int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface); void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface); +void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface); #else diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 1f90808..ccc7641 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -706,6 +706,23 @@ out: return NULL; } +/** + * batadv_hardif_rename - rename the sysfs and debugfs + * @hard_iface: The hard interface to rename + * + * The sysfs and debugfs files cannot be removed until all users close + * them. So the removal is deferred into a work queue. This however + * means if the interface comes back before the work queue runs, the + * files are still there, and so the create gives an EEXISTS error. To + * avoid this, rename them to a tempory name. + */ +static void batadv_hardif_rename(struct batadv_hard_iface *hard_iface) +{ + batadv_sysfs_rename_hardif(&hard_iface->hardif_obj, + hard_iface->net_dev); + batadv_debugfs_rename_hardif(hard_iface); +} + static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) { ASSERT_RTNL(); @@ -719,6 +736,8 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) return; hard_iface->if_status = BATADV_IF_TO_BE_REMOVED; + batadv_hardif_rename(hard_iface); + queue_work(batadv_event_workqueue, &hard_iface->cleanup_work); } diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index fe9ca94..9b2c28f 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -48,6 +48,8 @@ #include "packet.h" #include "soft-interface.h" +static atomic_t batadv_rename = ATOMIC_INIT(0); + static struct net_device *batadv_kobj_to_netdev(struct kobject *obj) { struct device *dev = container_of(obj->parent, struct device, kobj); @@ -1046,6 +1048,21 @@ out: return -ENOMEM; } +void batadv_sysfs_rename_hardif(struct kobject **hardif_obj, + struct net_device *dev) +{ + char new_name[32]; + int err; + + snprintf(new_name, sizeof(*new_name) - 1, "tmp-%d", + atomic_inc_return(&batadv_rename)); + + err = kobject_rename(*hardif_obj, new_name); + if (err) + batadv_err(dev, "Can't rename sysfs dir: %s/%s: %d\n", + dev->name, new_name, err); +} + void batadv_sysfs_del_hardif(struct kobject **hardif_obj) { kobject_put(*hardif_obj); diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index c76021b..64d3722 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -48,6 +48,8 @@ void batadv_sysfs_del_meshif(struct net_device *dev); int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev); void batadv_sysfs_del_hardif(struct kobject **hardif_obj); +void batadv_sysfs_rename_hardif(struct kobject **hardif_obj, + struct net_device *dev); int batadv_sysfs_add_vlan(struct net_device *dev, struct batadv_softif_vlan *vlan); void batadv_sysfs_del_vlan(struct batadv_priv *bat_priv,

1 0

[linux-merge]linux integration; annotated tag, v4.7-rc3, created. v4.7-rc3
by postmaster＠open-mesh.org 12 Jun '16

12 Jun '16

The annotated tag, v4.7-rc3 has been created at a0b42bf4b0397d9cec150ac1d353f028d7b45e60 (tag) tagging 5edb56491d4812c42175980759da53388e5d86f5 (commit) replaces v4.7-rc2 tagged by Linus Torvalds on Sun Jun 12 07:20:46 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.7-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJXXW++AAoJEHm+PkMAQRiGexwH/1bhXocybASk4Zhr0tSxNThw Eo7IZJ4TGTCrU+kD7pbKWnE+bCU9c5SUxQRyIXBAPvXxxg4AWkk4rD78IVIscW8c cvdBe6SEaiWfvj8wI4wxCbELrmJnWsZXDh95679WzN+CmhpYt/Y+iQYvh7CAYDDP WaLUAvfkpPBIyeXm3MWD8QwOSqvdRjosiEhrTcMgw5sNUo/VZyKdAeF5/ZaAkGww vWa4BpZswjlbhu5yqKl9gTSoRFk7S68IvxRA5h4hAsf6rYkIZqEN8g/2mcoULViU wEsTksEU1YwfWFDqMU/s41lw/Ii+T/da3KYKtHxYpXUAtSroW2VvNllUsQs71QE= =/9FG -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] tag 'v2016.2' created
by postmaster＠open-mesh.org 09 Jun '16

09 Jun '16

Repository : ssh://git@open-mesh.org/alfred New tag : v2016.2 Referencing: 358c0f12c450cf3d6f6af4bf9917b408786f88ec

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (ba3f0a5)
by postmaster＠open-mesh.org 09 Jun '16

09 Jun '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit ba3f0a5cd96e784319123b840b16a48fc4db591c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Jun 9 16:22:00 2016 +0200 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ba3f0a5cd96e784319123b840b16a48fc4db591c CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 812e893..a9fafbc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +alfred 2016.2: + + * add support for automatic debugfs mount with enabled + CONFIG_ALFRED_CAPABILITIES + + -- Thu, 09 Jun 2016 16:21:19 +0200 + alfred 2016.1: * add support for master servers to receive push_data packets with foreign

1 0

[alfred] master: alfred: Start new development cycle (78e1d64)
by postmaster＠open-mesh.org 09 Jun '16

09 Jun '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 78e1d64df4063d3f3fa2bbbda85e4e6434c837ce Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Jun 9 16:22:50 2016 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 78e1d64df4063d3f3fa2bbbda85e4e6434c837ce 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 a5775b1..a9906c8 100644 --- a/alfred.h +++ b/alfred.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.2" +#define SOURCE_VERSION "2016.3" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 333a951..ed28df9 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -38,7 +38,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.2" +#define SOURCE_VERSION "2016.3" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 4c98064..3131b79 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -27,7 +27,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2016.2" +#define SOURCE_VERSION "2016.3" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[batctl] tag 'v2016.2' created
by postmaster＠open-mesh.org 09 Jun '16

09 Jun '16

Repository : ssh://git@open-mesh.org/batctl New tag : v2016.2 Referencing: 53bf2bd355d6141a986ac39086f5d5b865259ff5

1 0

[batctl] master's head updated: Merge branch 'next' (08962df)
by postmaster＠open-mesh.org 09 Jun '16

09 Jun '16

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

1 0

← Newer
1
...
6
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2016