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@neomailbox.ch>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 5c122000688fba9a37c33d30b81e8f332d5a9b6f..b9b8b333b36344b617464522c4bff26f0a2c6e80 100644 (file)
--- 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 610620aa8d261e1733921248570a4b831db16a3e..f8317c1db427412db45f9c737391d2f21892b7cf 100644 (file)
--- 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);