Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f729dc70 authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

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: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Acked-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarAntonio Quartulli <antonio@meshcoding.com>
parent 1dd34b5a

net/batman-adv/bat_iv_ogm.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

net/batman-adv/originator.c

+6 −0
Original line number Diff line number Diff line
@@ -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);