commits March 2017

commits@lists.open-mesh.org

1 participants
26 discussions

[batman-adv] ecsv/pu, master: batman-adv: Omit unnecessary memset of netdev private data (9210dca)
by postmaster＠open-mesh.org 17 Mar '17

17 Mar '17

Repository : ssh://git@open-mesh.org/batman-adv On branches: ecsv/pu,master >--------------------------------------------------------------- commit 9210dca17a0acc2d01928893a61647153d578e33 Author: Tobias Klauser <tklauser(a)distanz.ch> Date: Fri Mar 17 12:08:59 2017 +0100 batman-adv: Omit unnecessary memset of netdev private data The memory for netdev_priv is allocated using kzalloc in alloc_netdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 9210dca17a0acc2d01928893a61647153d578e33 net/batman-adv/soft-interface.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index d042c99..4dd7840 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -971,8 +971,6 @@ static void batadv_softif_free(struct net_device *dev) */ static void batadv_softif_init_early(struct net_device *dev) { - struct batadv_priv *priv = netdev_priv(dev); - ether_setup(dev); dev->netdev_ops = &batadv_netdev_ops; @@ -989,8 +987,6 @@ static void batadv_softif_init_early(struct net_device *dev) eth_hw_addr_random(dev); dev->ethtool_ops = &batadv_ethtool_ops; - - memset(priv, 0, sizeof(*priv)); } struct net_device *batadv_softif_create(struct net *net, const char *name)

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20170316, deleted. v4.10-rc1-5-g1a9070e
by postmaster＠open-mesh.org 16 Mar '17

16 Mar '17

The annotated tag, batadv-net-for-davem-20170316 has been deleted was 3060e972c57ead41eaf6c0bea0bae21374881891 ----------------------------------------------------------------------- tag batadv-net-for-davem-20170316 Here are two batman-adv bugfixes: - Keep fragments equally sized, avoids some problems with too small fragments, by Sven Eckelmann - Initialize gateway class correctly when BATMAN V is compiled in, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAljKiocWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSYaD/4o3vSRQbiu95rzaPZbZ8cfFRYz FYS7b/SLV8Q8uxzCo05jimnYB9qGD8bZZlAPNhNZLqkSsTXc8vqfwPnyB9ytasrp A8jefoMlO0A5w3AQxBErzg3wrYr5Gz6lqkgqZTv06Sb6xa7F/OEo9pMjdbCBX15D G9y1FZdLZVhdVE8r9yUohbfcnZ4KkfBlViEXnjAcJoV2x4OOVGQjDdBGpaEQnwyk wyGEFuIO2oWW6AlQXCbXomTUZ6bAzJ43lPbRDWTVdrVJg2RV65F4MsNDfLpXVBQV GvmB33WVTzphQshxvhnjs2uWglnj8KGVcvpIp7GuRfGgpFJh9tbS2B0bITXCVxWU +HkNja6QwObwhEvAWfINaTT9RR1kxWAQk6YB9VEq3RJoHufP49felOZ877oAkK8T 7CwazIe4rOhA+ISLUcUFk5W9B46DusPRyfhzrDZ6EM0P/ppGWpKAioawltLqX2P3 kBmIW8kB6YRHnTeCHJZTjdPdQkYeIAYVunnhLvRrmTbf0oyVh3+UnwgAVquwJj/5 WsEqNPsP0B++nsWmT+MPVOKj/JwcmtKfaDY2sor72aN6TZxq7MF9VGdcZiOu9neB zILNcb0oIvUahb2SO2u/gH2E/4am+ED5StQmNxHdJf1A+iCYGXEy/yETgeIm51/S TaHd1aH3VwmCR0sAKw== =zGdm -----END PGP SIGNATURE----- 1a9070ec91b37234fe915849b767c61584c64a44 batman-adv: Initialize gw sel_class via batadv_algo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20170316, created. batadv-net-for-davem-20170316
by postmaster＠open-mesh.org 16 Mar '17

16 Mar '17

The annotated tag, batadv-net-for-davem-20170316 has been created at 3060e972c57ead41eaf6c0bea0bae21374881891 (tag) tagging 1a9070ec91b37234fe915849b767c61584c64a44 (commit) replaces v4.10-rc1 tagged by Simon Wunderlich on Thu Mar 16 13:52:23 2017 +0100 - Shortlog ------------------------------------------------------------ Here are two batman-adv bugfixes: - Keep fragments equally sized, avoids some problems with too small fragments, by Sven Eckelmann - Initialize gateway class correctly when BATMAN V is compiled in, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAljKiocWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSYaD/4o3vSRQbiu95rzaPZbZ8cfFRYz FYS7b/SLV8Q8uxzCo05jimnYB9qGD8bZZlAPNhNZLqkSsTXc8vqfwPnyB9ytasrp A8jefoMlO0A5w3AQxBErzg3wrYr5Gz6lqkgqZTv06Sb6xa7F/OEo9pMjdbCBX15D G9y1FZdLZVhdVE8r9yUohbfcnZ4KkfBlViEXnjAcJoV2x4OOVGQjDdBGpaEQnwyk wyGEFuIO2oWW6AlQXCbXomTUZ6bAzJ43lPbRDWTVdrVJg2RV65F4MsNDfLpXVBQV GvmB33WVTzphQshxvhnjs2uWglnj8KGVcvpIp7GuRfGgpFJh9tbS2B0bITXCVxWU +HkNja6QwObwhEvAWfINaTT9RR1kxWAQk6YB9VEq3RJoHufP49felOZ877oAkK8T 7CwazIe4rOhA+ISLUcUFk5W9B46DusPRyfhzrDZ6EM0P/ppGWpKAioawltLqX2P3 kBmIW8kB6YRHnTeCHJZTjdPdQkYeIAYVunnhLvRrmTbf0oyVh3+UnwgAVquwJj/5 WsEqNPsP0B++nsWmT+MPVOKj/JwcmtKfaDY2sor72aN6TZxq7MF9VGdcZiOu9neB zILNcb0oIvUahb2SO2u/gH2E/4am+ED5StQmNxHdJf1A+iCYGXEy/yETgeIm51/S TaHd1aH3VwmCR0sAKw== =zGdm -----END PGP SIGNATURE----- Linus Lüssing (1): batman-adv: Fix transmission of final, 16th fragment Sven Eckelmann (4): batman-adv: Decrease hardif refcnt on fragmentation send error batman-adv: Fix double free during fragment merge error batman-adv: Keep fragments equally sized batman-adv: Initialize gw sel_class via batadv_algo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.11-rc2, created. v4.11-rc2
by postmaster＠open-mesh.org 12 Mar '17

12 Mar '17

The annotated tag, v4.11-rc2 has been created at c76a1ee152bc8a85ee33acebc48d0db1fafddb0c (tag) tagging 4495c08e84729385774601b5146d51d9e5849f81 (commit) replaces v4.11-rc1 tagged by Linus Torvalds on Sun Mar 12 14:47:14 2017 -0700 - Shortlog ------------------------------------------------------------ Linux 4.11-rc2 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJYxcHiAAoJEHm+PkMAQRiGjzEIAJGNiGAKUfOo3JTIur33SpH2 pNCzWbz3XvZQhxWBv9hIEDwuznYHcgha3sTPlbXpRqziNYT+UyoASy1hULJFNTf5 f8LQfFUVvgeB0eP+EzrJ0P3PbsZqQd2S0rTswqYG9Vdxkjhqn/h3tNgiQbxHfTbI ebh12Qnbyy0WzUNhFa+gk/Yh3+FNcPSByX0IkCedS+9CfRLA6nO8VfRhVyJev0Yy O6kUqA740J6BZBAqRdk7Eg2v6KDAyGNmchwBFBCqi26xpeVKCyCeNKrTRiYEU8kR eJ9ThasZT2iPwprkpzQ14DHWlqufXSg0ekC5U/mGNHqGnbGAF4K7+dISV/m/tQ0= =C/c7 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'maint' (1b6c40c)
by postmaster＠open-mesh.org 07 Mar '17

07 Mar '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1b6c40c9d6df743997427a77976f40dbf981241a Merge: 5283463 eb84f4e Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Mar 7 17:01:14 2017 +0100 Merge branch 'maint' >--------------------------------------------------------------- 1b6c40c9d6df743997427a77976f40dbf981241a CHANGELOG | 10 ++++++ compat-include/linux/average.h | 67 +++++++++++++++++++++++++++-------------- net/batman-adv/bat_iv_ogm.c | 11 +++++++ net/batman-adv/bat_v.c | 14 +++++++-- net/batman-adv/gateway_common.c | 5 +++ net/batman-adv/soft-interface.c | 1 - net/batman-adv/types.h | 4 ++- 7 files changed, 84 insertions(+), 28 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'maint' (1b6c40c)
by postmaster＠open-mesh.org 07 Mar '17

07 Mar '17

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: e094894 batman-adv: average: change to declare precision, not factor 11a0c90 batman-adv: Keep fragments equally sized ef565a1 batman-adv: Initialize gw sel_class via batadv_algo 8c45e05 batman-adv: Update CHANGELOG for upcoming release eb84f4e batman-adv: bump version number for compat release 1b6c40c Merge branch 'maint'

1 0

[batman-adv] tag 'v2017.0.1' created
by postmaster＠open-mesh.org 07 Mar '17

07 Mar '17

Repository : ssh://git@open-mesh.org/batman-adv New tag : v2017.0.1 Referencing: 394120d875848c43833fe40164277a8f6ce644dc

1 0

[batman-adv] maint, release-2017.0.1: batman-adv: Update CHANGELOG for upcoming release (8c45e05)
by postmaster＠open-mesh.org 07 Mar '17

07 Mar '17

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,release-2017.0.1 >--------------------------------------------------------------- commit 8c45e05cc040e9c09be44a49f88c34008ee4d32c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Mar 7 16:34:45 2017 +0100 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 8c45e05cc040e9c09be44a49f88c34008ee4d32c CHANGELOG | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e1f8136..0ede07c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +batman-adv 2017.0.1 + + * support latest kernels (3.2 - 4.11) + * bugs squashed: + - avoid API incompatibilities with new EWMA implementation + - generate equally size fragments to reduce chance of padding or MTU problems + - fix initialization of gateway sel class when BATMAN_V is compiled in + + -- Tue, 07 Mar 2017 16:33:11 +0100 + batman-adv 2017.0 * support latest kernels (3.2 - 4.11)

1 0

[batman-adv] maint, release-2017.0.1: batman-adv: bump version number for compat release (eb84f4e)
by postmaster＠open-mesh.org 07 Mar '17

07 Mar '17

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,release-2017.0.1 >--------------------------------------------------------------- commit eb84f4ef653f9f4367e6bf029bda9c830f0cf2ec Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Mar 7 16:37:45 2017 +0100 batman-adv: bump version number for compat release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- eb84f4ef653f9f4367e6bf029bda9c830f0cf2ec net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 57a8103..f156eab 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2017.0" +#define BATADV_SOURCE_VERSION "2017.0.1" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] maint, release-2017.0.1: batman-adv: Initialize gw sel_class via batadv_algo (ef565a1)
by postmaster＠open-mesh.org 07 Mar '17

07 Mar '17

Repository : ssh://git@open-mesh.org/batman-adv On branches: maint,release-2017.0.1 >--------------------------------------------------------------- commit ef565a1434966750644affda86fd11b0b69edbfe Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 4 16:33:31 2017 +0100 batman-adv: Initialize gw sel_class via batadv_algo The gateway selection class variable is shared between different algorithm versions. But the interpretation of the content is algorithm specific. The initialization is therefore also algorithm specific. But this was implemented incorrectly and the initialization for BATMAN_V always overwrote the value previously written for BATMAN_IV. This could only be avoided when BATMAN_V was disabled during compile time. Using a special batadv_algo hook for this initialization avoids this problem. Fixes: 80b2d47be2c7 ("batman-adv: B.A.T.M.A.N. V - implement GW selection logic") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ef565a1434966750644affda86fd11b0b69edbfe net/batman-adv/bat_iv_ogm.c | 11 +++++++++++ net/batman-adv/bat_v.c | 14 +++++++++++--- net/batman-adv/gateway_common.c | 5 +++++ net/batman-adv/soft-interface.c | 1 - net/batman-adv/types.h | 2 ++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 7c3d994..71343d0 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -2477,6 +2477,16 @@ static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface) batadv_iv_ogm_schedule(hard_iface); } +/** + * batadv_iv_init_sel_class - initialize GW selection class + * @bat_priv: the bat priv with all the soft interface information + */ +static void batadv_iv_init_sel_class(struct batadv_priv *bat_priv) +{ + /* set default TQ difference threshold to 20 */ + atomic_set(&bat_priv->gw.sel_class, 20); +} + static struct batadv_gw_node * batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) { @@ -2823,6 +2833,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .del_if = batadv_iv_ogm_orig_del_if, }, .gw = { + .init_sel_class = batadv_iv_init_sel_class, .get_best_gw_node = batadv_iv_gw_get_best_gw_node, .is_eligible = batadv_iv_gw_is_eligible, #ifdef CONFIG_BATMAN_ADV_DEBUGFS diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 0acd081..a36c8e7 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -668,6 +668,16 @@ err_ifinfo1: return ret; } +/** + * batadv_v_init_sel_class - initialize GW selection class + * @bat_priv: the bat priv with all the soft interface information + */ +static void batadv_v_init_sel_class(struct batadv_priv *bat_priv) +{ + /* set default throughput difference threshold to 5Mbps */ + atomic_set(&bat_priv->gw.sel_class, 50); +} + static ssize_t batadv_v_store_sel_class(struct batadv_priv *bat_priv, char *buff, size_t count) { @@ -1052,6 +1062,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .dump = batadv_v_orig_dump, }, .gw = { + .init_sel_class = batadv_v_init_sel_class, .store_sel_class = batadv_v_store_sel_class, .show_sel_class = batadv_v_show_sel_class, .get_best_gw_node = batadv_v_gw_get_best_gw_node, @@ -1092,9 +1103,6 @@ int batadv_v_mesh_init(struct batadv_priv *bat_priv) if (ret < 0) return ret; - /* set default throughput difference threshold to 5Mbps */ - atomic_set(&bat_priv->gw.sel_class, 50); - return 0; } diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 5db2e43..33940c5 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -253,6 +253,11 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, */ void batadv_gw_init(struct batadv_priv *bat_priv) { + if (bat_priv->algo_ops->gw.init_sel_class) + bat_priv->algo_ops->gw.init_sel_class(bat_priv); + else + atomic_set(&bat_priv->gw.sel_class, 1); + batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1, NULL, BATADV_TVLV_GW, 1, BATADV_TVLV_HANDLER_OGM_CIFNOTFND); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 5d099b2..d042c99 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -819,7 +819,6 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0); #endif atomic_set(&bat_priv->gw.mode, BATADV_GW_MODE_OFF); - atomic_set(&bat_priv->gw.sel_class, 20); atomic_set(&bat_priv->gw.bandwidth_down, 100); atomic_set(&bat_priv->gw.bandwidth_up, 20); atomic_set(&bat_priv->orig_interval, 1000); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 66b25e4..246f21b 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1489,6 +1489,7 @@ struct batadv_algo_orig_ops { /** * struct batadv_algo_gw_ops - mesh algorithm callbacks (GW specific) + * @init_sel_class: initialize GW selection class (optional) * @store_sel_class: parse and stores a new GW selection class (optional) * @show_sel_class: prints the current GW selection class (optional) * @get_best_gw_node: select the best GW from the list of available nodes @@ -1499,6 +1500,7 @@ struct batadv_algo_orig_ops { * @dump: dump gateways to a netlink socket (optional) */ struct batadv_algo_gw_ops { + void (*init_sel_class)(struct batadv_priv *bat_priv); ssize_t (*store_sel_class)(struct batadv_priv *bat_priv, char *buff, size_t count); ssize_t (*show_sel_class)(struct batadv_priv *bat_priv, char *buff);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2017