commits February 2016

commits@lists.open-mesh.org

1 participants
70 discussions

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 29 Feb '16

29 Feb '16

The annotated tag, batman-adv-for-davem has been updated to 6b8d97613778c47afc26074fd857db6675e8d6f2 (tag) from 7a586cd99949fc6f46602d7bb1bb9cce9be88f05 (which is now obsolete) tagging 8b823170550e5dcc80512143088c9f9e24598f9a (commit) replaces v4.5-rc5 tagged by Antonio Quartulli on Mon Feb 29 17:05:57 2016 +0800 - Shortlog ------------------------------------------------------------ With this patchset we finally introduce our new routing protocol: B.A.T.M.A.N. V. Its implementation started quite some years ago, but due to the big changes being introduced it took a while to be discussed, designed, worked, re-worked, tested and debugged (well, we're never done with the latest). The entire operation has basically been a team work involving all the core contributors together with other people interested in the project. The new protocol is divided into two main subcomponents, called respectively ELP and OGMv2. The former is in charge of dealing with the neighbour discovery and link quality estimation, while the latter implements the algorithm that spreads the metrics around the network and computes optimal paths. The biggest change introduced with B.A.T.M.A.N. V is the new metric: the protocol won't rely on packet loss anymore, but it will use the estimated throughput extracted directly from the wifi driver (when available) by querying cfg80211. Batman-adv will also send some unicast probing packets when an interface is not used for payload traffic to make sure that such values are current. The new protocol can be compiled-in or not like other features we have and when selected will pull in CFG80211 as dependency for the reason described above. Thanks to the big work brought up in the past by Marek Lindner, batman-adv can easily deal several protocol implementations, therefore compiling in this new version does not exclude the older. This means that the user is offered the option to choose the protocol when creating the mesh interface (default is the old one to keep backward compatibility). Along with the protocol there are some sysfs knobs that are introduced to fine tune some of its behaviours, but users are recommended to keep the default values unless they know what they are doing. The last patch is about advertising our own patchwork platform (thanks to Sven Eckelmann for having set that up!) in the MAINTAINERS file. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJW1AvOAAoJENpFlCjNi1MRKxsP/1BR8Wh3MrtNhX7MMe7PnZEQ p00kArkjtnZCbBVFbG3JduqYaOPnGyzCLgBgF3DnOxx8gAGUEu6fu4AQNNr9jiUM 4lPnPbe5NuvjzQW27fJDZMuy4Y1FLaJ5DeoYjDH48/YDNS38nzlPPtNwg0pJA2TG C22dM6CX9kzxiy5RETmjgIjK2fgIybudWtCv7BGZxNyiqMaq+bYD+ZJJ6/wbj/FV uKbWB28puJZ3U3qTJ6ygbhAq8moeubp/nbZeh2RGkhpmnS7LKgdLWyPxJLAEza7Z jbdhyAE2xDYaU2xxVdOH9GecSYeUlQ+mrBdEblo2cfKMgShwZBrNjQxCaJIHN3G9 ta44yUpjGFl6/HIQnzfNZD4bTRNnb/DeRTG5qWxdrGAbxZESsMPf1Ph/hZ+KvSZ5 7eSZPmVGRYl8hJaLc25bG8pCOLQRsx/54hXNqYRqmImiPQi4IRvKUQkEDXBpHrT+ EwChfIQvCJSzZQAljrhYP/ytg/CiZxNKgW1u8cJRlHRs3jbBxJUJ67gvf2yWdQdj Luc76uLA1++8QLqhny6AtLeRrr7mYDFnJuNjkwbqWFSyBK6r/lKS1L3ereTfeVIM 5VWMuEDlbWuPscufDJ6WDgWwTqypybjvYbnDlQV7xHap7OegyS/ukQVz2W5lXvS1 gGERfC8WeW1JnFb5TSAY =qd6p -----END PGP SIGNATURE----- Andrew Lunn (1): batman-adv: Avoid endless loop in bat-on-bat netdevice check Antonio Quartulli (12): batman-adv: fix kerneldoc for DAT functions batman-adv: fix kerneldoc for TT functions batman-adv: add kernel doc for AP isolation attributes in bat_priv batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant batman-adv: OGMv2 - add basic infrastructure batman-adv: OGMv2 - implement originators logic batman-adv: add throughput override attribute to hard_ifaces batman-adv: keep track of when unicast packets are sent batman-adv: ELP - compute the metric based on the estimated throughput batman-adv: ELP - send unicast ELP packets for throughput sampling batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API David S. Miller (4): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Linus Luessing (5): batman-adv: Add hard_iface specific sysfs wrapper macros for UINT batman-adv: ELP - adding basic infrastructure batman-adv: ELP - creating neighbor structures batman-adv: ELP - adding sysfs parameter for elp interval batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API Marek Lindner (1): batman-adv: kernel doc readability updates Simon Wunderlich (4): batman-adv: Update/repair bridge loop avoidance kerneldoc batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet batman-adv: add seqno maximum age and protection start flag parameters batman-adv: Start new development cycle Sven Eckelmann (51): batman-adv: Fix kerneldoc parsing of structs/enums batman-adv: Remove kerneldoc for missing parameters batman-adv: Fix names in kerneldoc of functions batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs batman-adv: Fix kerneldoc parsing of return description batman-adv: Fix kerneldoc of main functions batman-adv: Fix kerneldoc of network-coding functions batman-adv: Fix kernel-doc for batadv_claim_free_ref batman-adv: update copyright years for 2016 batman-adv: Switch to HTTPS version of links batman-adv: Drop reference to netdevice on last reference batman-adv: Add lockdep assert for container_list_lock batman-adv: Convert batadv_hardif_neigh_node to kref batman-adv: Convert batadv_gw_node to kref batman-adv: Convert batadv_softif_vlan to kref batman-adv: Convert batadv_bla_backbone_gw to kref batman-adv: Convert batadv_bla_claim to kref batman-adv: Convert batadv_nc_node to kref batman-adv: Convert batadv_nc_path to kref batman-adv: Convert batadv_dat_entry to kref batman-adv: Convert batadv_tvlv_container to kref batman-adv: Convert batadv_tvlv_handler to kref batman-adv: Convert batadv_tt_orig_list_entry to kref batman-adv: Convert batadv_neigh_ifinfo to kref batman-adv: Convert batadv_orig_ifinfo to kref batman-adv: Convert batadv_neigh_node to kref batman-adv: Convert batadv_hard_iface to kref batman-adv: Convert batadv_orig_node_vlan to kref batman-adv: Convert batadv_orig_node to kref batman-adv: Convert batadv_tt_common_entry to kref batman-adv: Only put gw_node list reference when removed batman-adv: Only put orig_node_vlan list reference when removed batman-adv: Rename batadv_orig_node *_free_ref function to *_put batman-adv: Rename batadv_hardif *_free_ref function to *_put batman-adv: Rename batadv_neigh_node *_free_ref function to *_put batman-adv: Rename batadv_neigh_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_orig_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_hardif_neigh *_free_ref function to *_put batman-adv: Rename batadv_backbone_gw *_free_ref function to *_put batman-adv: Rename batadv_claim *_free_ref function to *_put batman-adv: Rename batadv_dat_entry *_free_ref function to *_put batman-adv: Rename batadv_gw_node *_free_ref function to *_put batman-adv: Rename batadv_tvlv_handler *_free_ref function to *_put batman-adv: Rename batadv_tvlv_container *_free_ref function to *_put batman-adv: Rename batadv_softif_vlan *_free_ref function to *_put batman-adv: Rename batadv_nc_node *_free_ref function to *_put batman-adv: Rename batadv_nc_path *_free_ref function to *_put batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put batman-adv: Rename batadv_tt_local_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_global_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_orig_list_entry *_free_ref function to *_put ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 29 Feb '16

29 Feb '16

The annotated tag, batman-adv-for-davem has been updated to 7a586cd99949fc6f46602d7bb1bb9cce9be88f05 (tag) from 729c9ad6857576ac60775c7941d90b133b4b6753 (which is now obsolete) tagging 8b823170550e5dcc80512143088c9f9e24598f9a (commit) replaces v4.5-rc5 tagged by Antonio Quartulli on Mon Feb 29 16:55:13 2016 +0800 - Shortlog ------------------------------------------------------------ With this patchset we finally introduce our new routing protocol: B.A.T.M.A.N. V. Its implementation started quite some years ago, but due to the big changes being introduced it took a while to be discussed, designed, worked, re-worked, tested and debugged (well, we're never done with the latest). The entire operation has basically been a team work involving all the core contributors together with other people interested in the project. The new protocol is divided into two main subcomponents, called respectively ELP and OGMv2. The former is in charge of dealing with the neighbour discovery and link quality estimation, while the latter implements the algorithm that spreads the metrics around the network and computes optimal paths. The biggest change introduced with B.A.T.M.A.N. V is the new metric: the protocol won't rely on packet loss anymore, but it will use the estimated throughput extracted directly from the wifi driver (when available) by querying cfg80211. Batman-adv will also send some unicast probing packets when an interface is not used for payload traffic to make sure that such values are current. The new protocol can be compiled-in or not like other features we have and when selected will pull in CFG80211 as dependency for the reason described above. Thanks to the big work brought up in the past by Marek Lindner, batman-adv can easily deal several protocol implementations, therefore compiling in this new version does not exclude the older. This means that the user is offered the option to choose the protocol when creating the mesh interface (default is the old one to keep backward compatibility). Along with the protocol there are some sysfs knobs that are introduced to fine tune some of its behaviours, but users are recommended to keep the default values unless they know what they are doing. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJW1Ak7AAoJENpFlCjNi1MRuacP/1cvVIhuTO7jVlnaqqLGciJO AOMJvCjWef4AqS6aBwHnlD0p7FGHkICn/J8B7CaZJxEBqZ6q4SVMdZeMKTuzqAoC 9x2dyPs7vteavgOBjK65RrVkVoJQ+cVyOrp0zKi6+G/2RjwUSls87+x35DJFqskD A3v3LKqjs6lX2dGnmrbp8unxyL7bgKCY1qugPHF1yckrPmoi+cfRvBY/rWaSNdbu ARLVMAWSfBitI5awFO/Z+Oasre6ocAJ6RDSFnrFi7Pthdz1NAujoQ37YEB/RZiMg OYX03dyteFBSqaPHU+r1LTj/eUFMP1hbu2T6Fpjk7Ls1x5eEU2fPVtgNwF8q9PGx CX6cy1vO7/SniLH/F6h33MfDJAHtKROPhFb4Sivx6lKhYqwGull6D/r7rvAhSvMH 9bfl1x674VKHex3MyDerB3Ij+UCezxlbzORV6nDHrwUyM4gxJVRv80bsmFME8+Zt 8oCU/waiD15m1IqkwIcs0s2lhOQjwPTyhsXkKyaFoQdW1XNyIrx7zdakPFd1k2PW KNmvFozHlUkHbW1bhXZn5E+C81CFjeBy5qGC+DaYe1JV94WFtzQglH/5yrSXDEBC twlJmWnw8VAwUuV7iZ78aQSoCvyJ5q+Snwsb8euMbVE1hVPmAt/pUme6tOiQQdvG iE3ltVAXpmpjgyXNGj+U =KrR9 -----END PGP SIGNATURE----- Andrew Lunn (1): batman-adv: Avoid endless loop in bat-on-bat netdevice check Antonio Quartulli (12): batman-adv: fix kerneldoc for DAT functions batman-adv: fix kerneldoc for TT functions batman-adv: add kernel doc for AP isolation attributes in bat_priv batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant batman-adv: OGMv2 - add basic infrastructure batman-adv: OGMv2 - implement originators logic batman-adv: add throughput override attribute to hard_ifaces batman-adv: keep track of when unicast packets are sent batman-adv: ELP - compute the metric based on the estimated throughput batman-adv: ELP - send unicast ELP packets for throughput sampling batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API David S. Miller (4): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Linus Luessing (5): batman-adv: Add hard_iface specific sysfs wrapper macros for UINT batman-adv: ELP - adding basic infrastructure batman-adv: ELP - creating neighbor structures batman-adv: ELP - adding sysfs parameter for elp interval batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API Marek Lindner (1): batman-adv: kernel doc readability updates Simon Wunderlich (4): batman-adv: Update/repair bridge loop avoidance kerneldoc batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet batman-adv: add seqno maximum age and protection start flag parameters batman-adv: Start new development cycle Sven Eckelmann (51): batman-adv: Fix kerneldoc parsing of structs/enums batman-adv: Remove kerneldoc for missing parameters batman-adv: Fix names in kerneldoc of functions batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs batman-adv: Fix kerneldoc parsing of return description batman-adv: Fix kerneldoc of main functions batman-adv: Fix kerneldoc of network-coding functions batman-adv: Fix kernel-doc for batadv_claim_free_ref batman-adv: update copyright years for 2016 batman-adv: Switch to HTTPS version of links batman-adv: Drop reference to netdevice on last reference batman-adv: Add lockdep assert for container_list_lock batman-adv: Convert batadv_hardif_neigh_node to kref batman-adv: Convert batadv_gw_node to kref batman-adv: Convert batadv_softif_vlan to kref batman-adv: Convert batadv_bla_backbone_gw to kref batman-adv: Convert batadv_bla_claim to kref batman-adv: Convert batadv_nc_node to kref batman-adv: Convert batadv_nc_path to kref batman-adv: Convert batadv_dat_entry to kref batman-adv: Convert batadv_tvlv_container to kref batman-adv: Convert batadv_tvlv_handler to kref batman-adv: Convert batadv_tt_orig_list_entry to kref batman-adv: Convert batadv_neigh_ifinfo to kref batman-adv: Convert batadv_orig_ifinfo to kref batman-adv: Convert batadv_neigh_node to kref batman-adv: Convert batadv_hard_iface to kref batman-adv: Convert batadv_orig_node_vlan to kref batman-adv: Convert batadv_orig_node to kref batman-adv: Convert batadv_tt_common_entry to kref batman-adv: Only put gw_node list reference when removed batman-adv: Only put orig_node_vlan list reference when removed batman-adv: Rename batadv_orig_node *_free_ref function to *_put batman-adv: Rename batadv_hardif *_free_ref function to *_put batman-adv: Rename batadv_neigh_node *_free_ref function to *_put batman-adv: Rename batadv_neigh_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_orig_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_hardif_neigh *_free_ref function to *_put batman-adv: Rename batadv_backbone_gw *_free_ref function to *_put batman-adv: Rename batadv_claim *_free_ref function to *_put batman-adv: Rename batadv_dat_entry *_free_ref function to *_put batman-adv: Rename batadv_gw_node *_free_ref function to *_put batman-adv: Rename batadv_tvlv_handler *_free_ref function to *_put batman-adv: Rename batadv_tvlv_container *_free_ref function to *_put batman-adv: Rename batadv_softif_vlan *_free_ref function to *_put batman-adv: Rename batadv_nc_node *_free_ref function to *_put batman-adv: Rename batadv_nc_path *_free_ref function to *_put batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put batman-adv: Rename batadv_tt_local_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_global_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_orig_list_entry *_free_ref function to *_put ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (77ddf97)
by postmaster＠open-mesh.org 29 Feb '16

29 Feb '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 77ddf971a187eb4bec84c9f08793ff4460a38851 Merge: d7c9a9e 3515604 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Feb 29 10:23:50 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- 77ddf971a187eb4bec84c9f08793ff4460a38851 compat-include/linux/ethtool.h | 62 ++++++++++++++++++++++++++++++++++++++++++ net/batman-adv/bat_v_elp.c | 12 ++++---- 2 files changed, 68 insertions(+), 6 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (77ddf97)
by postmaster＠open-mesh.org 29 Feb '16

29 Feb '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 3515604 batman-adv: ELP - use new ethtool_link_get_ksettings API 77ddf97 Merge branch 'next'

1 0

[batman-adv] next: batman-adv: ELP - use new ethtool_link_get_ksettings API (3515604)
by postmaster＠open-mesh.org 29 Feb '16

29 Feb '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 3515604d82d5b8f80201d8ff0cc4708da8cddb00 Author: Antonio Quartulli <a(a)unstable.cc> Date: Sun Feb 28 10:44:30 2016 +0100 batman-adv: ELP - use new ethtool_link_get_ksettings API The ethtool API is changing in linux-4.6 and the B.A.T.M.A.N. V code has to be changed accordingly. Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput") Signed-off-by: Antonio Quartulli <a(a)unstable.cc> [sven(a)narfation.org: Added compat code for __ethtool_get_link_ksettings] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 3515604d82d5b8f80201d8ff0cc4708da8cddb00 compat-include/linux/ethtool.h | 62 ++++++++++++++++++++++++++++++++++++++++++ net/batman-adv/bat_v_elp.c | 12 ++++---- 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h new file mode 100644 index 0000000..87f7577 --- /dev/null +++ b/compat-include/linux/ethtool.h @@ -0,0 +1,62 @@ +/* Copyright (C) 2016 B.A.T.M.A.N. contributors: + * + * Antonio Quartulli + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ + +#include <linux/version.h> +#include_next <linux/ethtool.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) + +#define ethtool_link_ksettings batadv_ethtool_link_ksettings + +struct batadv_ethtool_link_ksettings { + struct { + __u32 speed; + __u8 duplex; + } base; +}; + +#define __ethtool_get_link_ksettings(__dev, __link_settings) \ + batadv_ethtool_get_link_ksettings(__dev, __link_settings) + +static inline int +batadv_ethtool_get_link_ksettings(struct net_device *dev, + struct ethtool_link_ksettings *link_ksettings) +{ + struct ethtool_cmd cmd; + int ret; + + memset(&cmd, 0, sizeof(cmd)); + ret = __ethtool_get_settings(dev, &cmd); + + if (ret != 0) + return ret; + + link_ksettings->base.duplex = cmd.duplex; + link_ksettings->base.speed = ethtool_cmd_speed(&cmd); + + return 0; +} + +#endif /* < KERNEL_VERSION(4, 6, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ */ diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index e94b4a0..3844e7e 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -73,8 +73,8 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface) static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) { struct batadv_hard_iface *hard_iface = neigh->if_incoming; + struct ethtool_link_ksettings link_settings; struct station_info sinfo; - struct ethtool_cmd cmd; u32 throughput; int ret; @@ -110,19 +110,19 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) /* if not a wifi interface, check if this device provides data via * ethtool (e.g. an Ethernet adapter) */ - memset(&cmd, 0, sizeof(cmd)); + memset(&link_settings, 0, sizeof(link_settings)); rtnl_lock(); - ret = __ethtool_get_settings(hard_iface->net_dev, &cmd); + ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings); rtnl_unlock(); if (ret == 0) { /* link characteristics might change over time */ - if (cmd.duplex == DUPLEX_FULL) + if (link_settings.base.duplex == DUPLEX_FULL) hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX; else hard_iface->bat_v.flags &= ~BATADV_FULL_DUPLEX; - throughput = ethtool_cmd_speed(&cmd); - if (throughput && throughput != SPEED_UNKNOWN) + throughput = link_settings.base.speed; + if (throughput && (throughput != SPEED_UNKNOWN)) return throughput * 10; }

1 0

[linux-merge]linux integration; annotated tag, v4.5-rc6, created. v4.5-rc6
by postmaster＠open-mesh.org 28 Feb '16

28 Feb '16

The annotated tag, v4.5-rc6 has been created at 527cae8caa26632d8355074027a03af92931ce07 (tag) tagging fc77dbd34c5c99bce46d40a2491937c3bcbd10af (commit) replaces v4.5-rc5 tagged by Linus Torvalds on Sun Feb 28 08:41:30 2016 -0800 - Shortlog ------------------------------------------------------------ Linux 4.5-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJW0yM6AAoJEHm+PkMAQRiGeUwIAJRTHFPJTFpJcJjeZEV4/EL1 7Pl0WSHs/CWBkXIevAg2HgkECSQ9NI9FAUFvoGxCldDpFAnL1U2QV8+Ur2qhiXMG 5v0jILJuiw57qT/NfhEudZolerlRoHILmB3JRTb+DUV4GHZuWpTkJfUSI9j5aTEl w83XUgtK4bKeIyFbHdWQk6xqfzfFBSuEITuSXreOMwkFfMmeScE0WXOPLBZWyhPa v0rARJLYgM+vmRAnJjnG8unH+SgnqiNcn2oOFpevKwmpVcOjcEmeuxh/HdeZf7HM /R8F86OwdmXsO+z8dQxfcucLg+I9YmKfFr8b6hopu1sRztss2+Uk6H1j2J7IFIg= =tvkh -----END PGP SIGNATURE----- Andrew Lunn (1): batman-adv: Avoid endless loop in bat-on-bat netdevice check Sven Eckelmann (2): batman-adv: Only put gw_node list reference when removed batman-adv: Only put orig_node_vlan list reference when removed ----------------------------------------------------------------------- -- linux integration

1 0

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

28 Feb '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 789b846 batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq 4030943 Merge branch 'maint' into next d7c9a9e Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (d7c9a9e)
by postmaster＠open-mesh.org 28 Feb '16

28 Feb '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d7c9a9eaeb3370c372b6ef1d33b73f7bbca70cb7 Merge: d58a135 4030943 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Feb 28 12:50:18 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- d7c9a9eaeb3370c372b6ef1d33b73f7bbca70cb7 net/batman-adv/bat_iv_ogm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --cc net/batman-adv/bat_iv_ogm.c index 14ee1df,dadd52a..2c65668 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -1182,10 -1145,10 +1182,11 @@@ static bool batadv_iv_ogm_calc_tq(struc u8 total_count; u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; - int tq_asym_penalty, inv_asym_penalty, if_num; - int if_num, ret = 0; ++ int if_num; + unsigned int tq_asym_penalty, inv_asym_penalty; unsigned int combined_tq; - int tq_iface_penalty; + unsigned int tq_iface_penalty; + bool ret = false; /* find corresponding one hop neighbor */ rcu_read_lock();

1 0

[batman-adv] next: Merge branch 'maint' into next (4030943)
by postmaster＠open-mesh.org 28 Feb '16

28 Feb '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 4030943108e5f6af6f97ac64ab4e1b38d14b04de Merge: 7028cda 789b846 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Feb 28 12:45:31 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 4030943108e5f6af6f97ac64ab4e1b38d14b04de net/batman-adv/bat_iv_ogm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

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

28 Feb '16

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 789b846 batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq 4030943 Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2016