commits August 2016

commits@lists.open-mesh.org

1 participants
14 discussions

[linux-merge]linux integration; annotated tag, v4.8-rc4, created. v4.8-rc4

by postmaster＠open-mesh.org

The annotated tag, v4.8-rc4 has been created at bc6679d273e0527adc36c295f71360be4feb40b5 (tag) tagging 3eab887a55424fc2c27553b7bfe32330df83f7b8 (commit) replaces v4.8-rc3 tagged by Linus Torvalds on Sun Aug 28 15:04:39 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.8-rc4 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJXw1/3AAoJEHm+PkMAQRiG+6gIAJrw8tD42Wt0oBQF1TFCUxBD DVqKDL36s7yPsdACjgAvuq/JMDNOOsdGxhM8t9mhVu6AfzqSW3k071Uu+HZHyhsU VL9nmlUnb4n09S9+TZzZApiR+vjw+FoE02EUIPI+wYNrjo1Jo7U7GMv+3HWj/4yq t5SSqnNZiUbIz9F1I9QKtXHd4zPMAUA8Q/sl9FiuJDzt6gxvNowSHGcPxjjWGTqp KFyco06DjKfpWhGW7oNSuvjWnQ1m0J5R3uk2JF5GDZkhpoBsLLnlpCI/yd5tm2hQ FYECj+CD4HhYlFrM9eTTJYKPQNglQzQIVrzjW3cjDq+/rA1HK5YEixPPA3tW7cI= =GJhV -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

6 years, 7 months

[batman-adv] master: Merge branch 'next' (e481da0)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e481da04e18dc69c1131ea9a6e659f4e01eb7d65 Merge: 4f47cce 6e16a7d Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Aug 26 17:21:05 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- e481da04e18dc69c1131ea9a6e659f4e01eb7d65 net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/routing.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-)

6 years, 7 months

[batman-adv] master's head updated: Merge branch 'next' (e481da0)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 008afae batman-adv: Add missing refcnt for last_candidate 0b75ad1 batman-adv: fix elp packet data reservation 6e16a7d Merge branch 'maint' into next e481da0 Merge branch 'next'

6 years, 7 months

[batman-adv] next: Merge branch 'maint' into next (6e16a7d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 6e16a7d24aa74c215ca102b55414a375f9f2a927 Merge: e3e3464 0b75ad1 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Aug 26 17:20:18 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 6e16a7d24aa74c215ca102b55414a375f9f2a927 net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/routing.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-)

6 years, 7 months

[batman-adv] next's head updated: Merge branch 'maint' into next (6e16a7d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 008afae batman-adv: Add missing refcnt for last_candidate 0b75ad1 batman-adv: fix elp packet data reservation 6e16a7d Merge branch 'maint' into next

6 years, 7 months

[batman-adv] maint: batman-adv: fix elp packet data reservation (0b75ad1)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 0b75ad13f3f38d8d84e2f4af37c0e13d77040bc1 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Aug 23 03:13:03 2016 +0200 batman-adv: fix elp packet data reservation The skb_reserve() call only reserved headroom for the mac header, but not the elp packet header itself. Fixing this by using skb_put()'ing towards the skb tail instead of skb_push()'ing towards the skb head. Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Reviewed-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 0b75ad13f3f38d8d84e2f4af37c0e13d77040bc1 net/batman-adv/bat_v_elp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index df42eb1..63762b3 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -334,7 +334,7 @@ int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface) goto out; skb_reserve(hard_iface->bat_v.elp_skb, ETH_HLEN + NET_IP_ALIGN); - elp_buff = skb_push(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN); + elp_buff = skb_put(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN); elp_packet = (struct batadv_elp_packet *)elp_buff; memset(elp_packet, 0, BATADV_ELP_HLEN);

6 years, 7 months

[batman-adv] maint: batman-adv: Add missing refcnt for last_candidate (008afae)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 008afae6eb75d62f421781924bed59631f5a9587 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 6 15:50:52 2016 +0200 batman-adv: Add missing refcnt for last_candidate batadv_find_router dereferences last_bonding_candidate from orig_node without making sure that it has a valid reference. This reference has to be retrieved by increasing the reference counter while holding neigh_list_lock. The lock is required to avoid that batadv_last_bonding_replace removes the current last_bonding_candidate, reduces the reference counter and maybe destroys the object in this process. Fixes: 797edd9e87ac ("batman-adv: add bonding again") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 008afae6eb75d62f421781924bed59631f5a9587 net/batman-adv/routing.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index bfac086..69d425d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -456,6 +456,29 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, } /** + * batadv_last_bonding_get - Get last_bonding_candidate of orig_node + * @orig_node: originator node whose last bonding candidate should be retrieved + * + * Return: last bonding candidate of router or NULL if not found + * + * The object is returned with refcounter increased by 1. + */ +static struct batadv_orig_ifinfo * +batadv_last_bonding_get(struct batadv_orig_node *orig_node) +{ + struct batadv_orig_ifinfo *last_bonding_candidate; + + spin_lock_bh(&orig_node->neigh_list_lock); + last_bonding_candidate = orig_node->last_bonding_candidate; + + if (last_bonding_candidate) + kref_get(&last_bonding_candidate->refcount); + spin_unlock_bh(&orig_node->neigh_list_lock); + + return last_bonding_candidate; +} + +/** * batadv_last_bonding_replace - Replace last_bonding_candidate of orig_node * @orig_node: originator node whose bonding candidates should be replaced * @new_candidate: new bonding candidate or NULL @@ -525,7 +548,7 @@ batadv_find_router(struct batadv_priv *bat_priv, * router - obviously there are no other candidates. */ rcu_read_lock(); - last_candidate = orig_node->last_bonding_candidate; + last_candidate = batadv_last_bonding_get(orig_node); if (last_candidate) last_cand_router = rcu_dereference(last_candidate->router); @@ -617,6 +640,9 @@ next: batadv_orig_ifinfo_put(next_candidate); } + if (last_candidate) + batadv_orig_ifinfo_put(last_candidate); + return router; }

6 years, 7 months

[openwrt-feed-devel] master: batman-adv-devel: move CONFIG_MODULE_STRIPPED hack to compat-hacks.h (1c8a672)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 1c8a672c7897105bb00a7121be5ad360488fd440 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Mon Aug 8 17:05:33 2016 +0200 batman-adv-devel: move CONFIG_MODULE_STRIPPED hack to compat-hacks.h The CONFIG_MODULE_STRIPPED hack broke some time ago, as it is undefined too late (after the headers using it have been included by compat-hacks.h). Undefine CONFIG_MODULE_STRIPPED at the top of compat-hacks.h instead to make the module version available to batctl again. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> >--------------------------------------------------------------- 1c8a672c7897105bb00a7121be5ad360488fd440 batman-adv-devel/Makefile | 2 -- batman-adv-devel/files/compat-hacks.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 4fa20ab..40bb493 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -92,8 +92,6 @@ endef define Build/Prepare $(call Build/Prepare/Default) $(CP) ./files/compat-hacks.h $(PKG_BUILD_DIR)/ - $(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \ - $(PKG_BUILD_DIR)/net/batman-adv/main.h endef define Build/Clean diff --git a/batman-adv-devel/files/compat-hacks.h b/batman-adv-devel/files/compat-hacks.h index e8b064c..e959ca3 100644 --- a/batman-adv-devel/files/compat-hacks.h +++ b/batman-adv-devel/files/compat-hacks.h @@ -1,5 +1,7 @@ /* Please avoid adding hacks here - instead add it to mac80211/backports.git */ +#undef CONFIG_MODULE_STRIPPED + #include <linux/version.h> /* LINUX_VERSION_CODE */ #include <linux/types.h>

6 years, 7 months

[linux-merge]linux integration; annotated tag, v4.8-rc3, created. v4.8-rc3

by postmaster＠open-mesh.org

The annotated tag, v4.8-rc3 has been created at ea79b5025467abc3c0441103b29f89c5ee81f174 (tag) tagging fa8410b355251fd30341662a40ac6b22d3e38468 (commit) replaces v4.8-rc2 tagged by Linus Torvalds on Sun Aug 21 16:14:19 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.8-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJXujXLAAoJEHm+PkMAQRiGnvcH/3HRYWZijAiKZ/epvnzyCXPc iK0gjuhWynEUDN52UxOkPAS7P/bF64gDDYy880cGUDV5K4Cq1a9T+HXzK47r3hLc AVeUXrwHGX2ftW75YagnJZTg6R2aFf+T9QZkx9btDckQuHhz8r4ww/r9RrWzNBWT 71hl5xUSIkGz+6hGrg7Fbxeff/6huat3et3aXUkCdMVG43C9wRWWZ3EHVLb9tpmV yHcl8uCbw0HSfQcvNYZge7ShM5E0BIW97/l+A3KTKoYhYGqAJ1vAbGVMTRqfNBXj IYSdOjWOSw4apIK/3pzAPE3lAlymm97XEDnGZNQg5GPDvvmx5COAGFOrhOuN00k= =PCzp -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

6 years, 7 months

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20160822, created. batadv-next-for-davem-20160822

by postmaster＠open-mesh.org

The annotated tag, batadv-next-for-davem-20160822 has been created at 9a20f90bce5f0bbd6c0a716d64dea999414bccd6 (tag) tagging dc1cbd145eecf21209d0322874e1766bcbce3e3f (commit) replaces batadv-next-for-davem-20160816 tagged by Simon Wunderlich on Mon Aug 22 15:52:21 2016 +0200 - Shortlog ------------------------------------------------------------ This feature patchset includes the following changes: - place kref_get near usage of referenced objects, separate patches for various used objects to improve readability and maintainability by Sven Eckelmann (18 patches) - Keep batadv net device when all hard interfaces disappear, to improve situations where tools currently use work arounds, by Sven Eckelmann - Add an option to disable debugfs support to minimize footprint when userspace uses netlink only, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdBQJXuwOiFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS nqFK2A/9HOwk9n9MEDBcGu3S2524LPO4yBIBlp9eo59gMuRezTPIKuqFT/bFhEfI /wwQDK8/lm4AaWGyo7JGCe5Q/4LJourue+QyT/IG0leoIeO4QxopvmskQnhKr8GT mB1vwVzMChBwCTjcr4qTxVNub5Zf2FrvpI8rEQsIYTATstyATQNszIllw19X0Eum 2Tc29QNoLJ1G1TgH57VCchf0QUEBXPk/yj/pll7YOFnv2LTN+hi6GHaw+A3DHXJL svT8m1eS70UhgtgXzEE6W6XSqHDXP96nyTd4DGd+YkpiXL480i2SanFY5e79ECIH 5W4blUa5QKhO7vhxFG01cf5TmiwNL9OpI7i4fj/UB+qlwLmowtnoQu07Wojtd1aL nR61zCjW+hvTPIvW3sNxskabZM8UHtMpiyoPIj/ZhnMchNfOCDVhaDgF+eiNpzL+ UlPrN1SOIftQ1IBjbX4KjQVVpHP8F3CWrfg+QlAzzkVtJ5Z7WMGedKBz1bobdlvJ N0Q6ytxG13eDaQHmjTDyAqFHfhCESNFMhjDaC7qOTovvkLUfA4PS0cqUzus0OJuD q78DKCxtkRhkxC7QKeUcI/WwONOmKcKPkD6pscP4RXBEhanhKPHAfDsdvMtxDG++ jGJLFbQHA9x09J5nrvUb35W2UhX/MLo3emTcGcBayP1dV8jFTJU= =/eyc -----END PGP SIGNATURE----- Sven Eckelmann (20): batman-adv: Place kref_get for orig_node_vlan near use batman-adv: Place kref_get for orig_ifinfo near use batman-adv: Place kref_get for tt_orig_list_entry near use batman-adv: Place kref_get for neigh_ifinfo near use batman-adv: Place kref_get for neigh_node near use batman-adv: Place kref_get for orig_node near use batman-adv: Place kref_get for tt_local_entry near use batman-adv: Place kref_get for tt_common near use batman-adv: Place kref_get for bla_claim near use batman-adv: Place kref_get for bla_backbone_gw near use batman-adv: Place kref_get for dat_entry near use batman-adv: Place kref_get for gw_node near use batman-adv: Place kref_get for hard_iface near use batman-adv: Place kref_get for softif_vlan near use batman-adv: Place kref_get for nc_node near use batman-adv: Place kref_get for nc_path near use batman-adv: Place kref_get for tvlv_container near use batman-adv: Place kref_get for tvlv_handler near use batman-adv: Keep batadv netdev when hardif disappears batman-adv: Allow to disable debugfs support ----------------------------------------------------------------------- -- linux integration

6 years, 7 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2016