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

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

net/batman-adv/bat_iv_ogm.c

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

}

net/batman-adv/originator.c

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

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE