commits August 2015

commits@lists.open-mesh.org

1 participants
114 discussions

[batman-adv] master: batman-adv: move neigh_node list add into batadv_neigh_node_new() (c214ebe)
by postmaster＠open-mesh.org 03 Aug '15

03 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c214ebe1eb2960d8c528e1a160da0d433e4425af Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jul 26 04:57:43 2015 +0800 batman-adv: move neigh_node list add into batadv_neigh_node_new() All batadv_neigh_node_* functions expect the neigh_node list item to be part of the orig_node->neigh_list, therefore the constructor of said list item should be adding the newly created neigh_node to the respective list. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- c214ebe1eb2960d8c528e1a160da0d433e4425af net/batman-adv/bat_iv_ogm.c | 21 +-------------------- net/batman-adv/originator.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index b18184e..5e93af4 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -296,8 +296,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, struct batadv_orig_node *orig_node, struct batadv_orig_node *orig_neigh) { - struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct batadv_neigh_node *neigh_node, *tmp_neigh_node; + struct batadv_neigh_node *neigh_node; neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node); if (!neigh_node) @@ -305,24 +304,6 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, neigh_node->orig_node = orig_neigh; - spin_lock_bh(&orig_node->neigh_list_lock); - tmp_neigh_node = batadv_neigh_node_get(orig_node, hard_iface, - neigh_addr); - if (!tmp_neigh_node) { - hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); - } else { - kfree(neigh_node); - batadv_hardif_free_ref(hard_iface); - neigh_node = tmp_neigh_node; - } - spin_unlock_bh(&orig_node->neigh_list_lock); - - if (!tmp_neigh_node) - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Creating new neighbor %pM for orig_node %pM on interface %s\n", - neigh_addr, orig_node->orig, - hard_iface->net_dev->name); - out: return neigh_node; } diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index f8317c1..f751775 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -457,6 +457,10 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, { struct batadv_neigh_node *neigh_node; + neigh_node = batadv_neigh_node_get(orig_node, hard_iface, neigh_addr); + if (neigh_node) + goto out; + neigh_node = kzalloc(sizeof(*neigh_node), GFP_ATOMIC); if (!neigh_node) goto out; @@ -478,6 +482,14 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, /* extra reference for return */ atomic_set(&neigh_node->refcount, 2); + spin_lock_bh(&orig_node->neigh_list_lock); + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + spin_unlock_bh(&orig_node->neigh_list_lock); + + batadv_dbg(BATADV_DBG_BATMAN, orig_node->bat_priv, + "Creating new neighbor %pM for orig_node %pM on interface %s\n", + neigh_addr, orig_node->orig, hard_iface->net_dev->name); + out: return neigh_node; }

1 0

[batman-adv] master: batman-adv: remove redundant hard_iface assignment (f645ed9)
by postmaster＠open-mesh.org 03 Aug '15

03 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f645ed95afc2fbf340a6e25352dadbd8e115a753 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jul 26 04:37:47 2015 +0800 batman-adv: remove redundant hard_iface assignment The batadv_neigh_node_new() function already sets the hard_iface pointer. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- f645ed95afc2fbf340a6e25352dadbd8e115a753 net/batman-adv/bat_iv_ogm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index b9b8b33..b18184e 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -304,7 +304,6 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, goto out; neigh_node->orig_node = orig_neigh; - neigh_node->if_incoming = hard_iface; spin_lock_bh(&orig_node->neigh_list_lock); tmp_neigh_node = batadv_neigh_node_get(orig_node, hard_iface,

1 0

[batman-adv] master: batman-adv: move hardif refcount inc to batadv_neigh_node_new() (02cf80c)
by postmaster＠open-mesh.org 03 Aug '15

03 Aug '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 02cf80cac9e92231c66360efac35406b05afba27 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jul 26 04:37:15 2015 +0800 batman-adv: move hardif refcount inc to batadv_neigh_node_new() The batadv_neigh_node cleanup function 'batadv_neigh_node_free_rcu()' takes care of reducing the hardif refcounter, hence it's only logical to assume the creating function of that same object 'batadv_neigh_node_new()' takes care of increasing the same refcounter. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 02cf80cac9e92231c66360efac35406b05afba27 net/batman-adv/bat_iv_ogm.c | 6 ------ net/batman-adv/originator.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 5c12200..b9b8b33 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -303,12 +303,6 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, if (!neigh_node) goto out; - if (!atomic_inc_not_zero(&hard_iface->refcount)) { - kfree(neigh_node); - neigh_node = NULL; - goto out; - } - neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 610620a..f8317c1 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -461,6 +461,12 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, if (!neigh_node) goto out; + if (!atomic_inc_not_zero(&hard_iface->refcount)) { + kfree(neigh_node); + neigh_node = NULL; + goto out; + } + INIT_HLIST_NODE(&neigh_node->list); INIT_HLIST_HEAD(&neigh_node->ifinfo_list); spin_lock_init(&neigh_node->ifinfo_lock);

1 0

[linux-merge]; annotated tag, batman-adv-fix-for-davem, deleted. v4.1-rc7-101-gc065d51
by postmaster＠open-mesh.org 01 Aug '15

01 Aug '15

The annotated tag, batman-adv-fix-for-davem has been deleted was 9781e8fad6861aebbb5a1ccc29f7afc5e32db53e ----------------------------------------------------------------------- tag batman-adv-fix-for-davem Included changes: - fix gateway selection metric overflow - avoid the Distriubted ARP Table to fool Ethernet switches by forging unexpected packets -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJVf+tAAAoJEOb/4TMchkvfSqYP/AkeMAK5ejivgA2caT1oCFtW rTRaAX/Y6MpQgJoVPVVd7ZfsmaNeRwu6H02Gio7j+R4Na9ALCbNxWnjM+U5NwlHr IG2rc/vvRkQgz46dxvtgPCJPzHvB404gwoS0dRJ5gBhoXUq2t+YU9V4P/9a0mpwx p7vSq8Zh5zVRcjcXBW1UbHwqAUC+dHt3bvjxrDWFaaoFKKFu4IoPn4WWYs3pHVoY g57q+uvyYZKW0dGtYf7wJRe+3DVFCgcfdk9XM1q5bGeZUyXut96yW18jlbd89dRp Lyvf7+qOYtz4gI5um/03Wcuu7Oj4w8/sKePCpxZN2VoIaw1m3d+wUdVHX159GTlv Ia4hcgdrURLFu+OGNWhslXyU2xDp6YYW3H2Mh1SyEOG2r97GFpecrx/O2QZrtSBR Q4LIKhYw89L5gNPVHPdvIZUZvhpCdc2jihUWkEJRxrfSNu9Qtd+V9EY6TM4BOFMl fHs6UxrXpjaSNTvB553QWhIW6UmFhujPpKbnnoS1VtGb1TBI79R5aWqd+o5Kb5Gq RLS3ehTy40sDE6FEx6VaIYAcZJuX4hLC3op+wM3Htic5qY1OOgRBnKxEv0UBtYZR heZstHyIEnUzHjdmrmAjP2pHycZCaXFE5bSfq9eCBVtNDfTqmNYmgCth9kFHFZfj oQLt1bCKd+FHHO/gxCOD =OpWo -----END PGP SIGNATURE----- c065d51055924f6daad8e16307c364602b0f9805 batman-adv: avoid DAT to mess up LAN state ----------------------------------------------------------------------- --

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2015