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

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

batman-adv: turn batadv_neigh_node_get() into local function 



commit c214ebe1eb29 ("batman-adv: move neigh_node list add into
batadv_neigh_node_new()") removed external calls to
batadv_neigh_node_get().

Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <antonio@meshcoding.com>
parent 7bca68c7

net/batman-adv/originator.c

+36 −36
Original line number Diff line number Diff line
@@ -442,6 +442,42 @@ batadv_neigh_ifinfo_new(struct batadv_neigh_node *neigh, 
	return neigh_ifinfo;

}



/**

 * batadv_neigh_node_get - retrieve a neighbour from the list

 * @orig_node: originator which the neighbour belongs to

 * @hard_iface: the interface where this neighbour is connected to

 * @addr: the address of the neighbour

 *

 * Looks for and possibly returns a neighbour belonging to this originator list

 * which is connected through the provided hard interface.

 * Returns NULL if the neighbour is not found.

 */

static struct batadv_neigh_node *

batadv_neigh_node_get(const struct batadv_orig_node *orig_node,

		      const struct batadv_hard_iface *hard_iface,

		      const u8 *addr)

{

	struct batadv_neigh_node *tmp_neigh_node, *res = NULL;



	rcu_read_lock();

	hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) {

		if (!batadv_compare_eth(tmp_neigh_node->addr, addr))

			continue;



		if (tmp_neigh_node->if_incoming != hard_iface)

			continue;



		if (!atomic_inc_not_zero(&tmp_neigh_node->refcount))

			continue;



		res = tmp_neigh_node;

		break;

	}

	rcu_read_unlock();



	return res;

}



/**

 * batadv_neigh_node_new - create and init a new neigh_node object

 * @orig_node: originator object representing the neighbour
@@ -495,42 +531,6 @@ batadv_neigh_node_new(struct batadv_orig_node *orig_node, 
	return neigh_node;

}



/**

 * batadv_neigh_node_get - retrieve a neighbour from the list

 * @orig_node: originator which the neighbour belongs to

 * @hard_iface: the interface where this neighbour is connected to

 * @addr: the address of the neighbour

 *

 * Looks for and possibly returns a neighbour belonging to this originator list

 * which is connected through the provided hard interface.

 * Returns NULL if the neighbour is not found.

 */

struct batadv_neigh_node *

batadv_neigh_node_get(const struct batadv_orig_node *orig_node,

		      const struct batadv_hard_iface *hard_iface,

		      const u8 *addr)

{

	struct batadv_neigh_node *tmp_neigh_node, *res = NULL;



	rcu_read_lock();

	hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) {

		if (!batadv_compare_eth(tmp_neigh_node->addr, addr))

			continue;



		if (tmp_neigh_node->if_incoming != hard_iface)

			continue;



		if (!atomic_inc_not_zero(&tmp_neigh_node->refcount))

			continue;



		res = tmp_neigh_node;

		break;

	}

	rcu_read_unlock();



	return res;

}



/**

 * batadv_orig_ifinfo_free_rcu - free the orig_ifinfo object

 * @rcu: rcu pointer of the orig_ifinfo object

net/batman-adv/originator.h

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node); 
struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv,

					      const u8 *addr);

struct batadv_neigh_node *

batadv_neigh_node_get(const struct batadv_orig_node *orig_node,

		      const struct batadv_hard_iface *hard_iface,

		      const u8 *addr);

struct batadv_neigh_node *

batadv_neigh_node_new(struct batadv_orig_node *orig_node,

		      struct batadv_hard_iface *hard_iface,

		      const u8 *neigh_addr);