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

batman-adv: prepare lq_update_lock to be shared among different protocols 



Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 3275e7cc

net/batman-adv/bat_iv_ogm.c

+4 −5
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface, 
		goto out;



	INIT_LIST_HEAD(&neigh_node->bonding_list);

	spin_lock_init(&neigh_node->tq_lock);



	neigh_node->orig_node = orig_neigh;

	neigh_node->if_incoming = hard_iface;
@@ -637,12 +636,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, 
		if (is_duplicate)

			continue;



		spin_lock_bh(&tmp_neigh_node->tq_lock);

		spin_lock_bh(&tmp_neigh_node->lq_update_lock);

		ring_buffer_set(tmp_neigh_node->tq_recv,

				&tmp_neigh_node->tq_index, 0);

		tmp_neigh_node->tq_avg =

			ring_buffer_avg(tmp_neigh_node->tq_recv);

		spin_unlock_bh(&tmp_neigh_node->tq_lock);

		spin_unlock_bh(&tmp_neigh_node->lq_update_lock);

	}



	if (!neigh_node) {
@@ -668,12 +667,12 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, 
	orig_node->flags = batman_ogm_packet->flags;

	neigh_node->last_seen = jiffies;



	spin_lock_bh(&neigh_node->tq_lock);

	spin_lock_bh(&neigh_node->lq_update_lock);

	ring_buffer_set(neigh_node->tq_recv,

			&neigh_node->tq_index,

			batman_ogm_packet->tq);

	neigh_node->tq_avg = ring_buffer_avg(neigh_node->tq_recv);

	spin_unlock_bh(&neigh_node->tq_lock);

	spin_unlock_bh(&neigh_node->lq_update_lock);



	if (!is_duplicate) {

		orig_node->last_ttl = batman_ogm_packet->header.ttl;

net/batman-adv/originator.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, 
	INIT_HLIST_NODE(&neigh_node->list);



	memcpy(neigh_node->addr, neigh_addr, ETH_ALEN);

	spin_lock_init(&neigh_node->lq_update_lock);



	/* extra reference for return */

	atomic_set(&neigh_node->refcount, 2);

net/batman-adv/types.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ struct neigh_node { 
	struct rcu_head rcu;

	struct orig_node *orig_node;

	struct hard_iface *if_incoming;

	spinlock_t tq_lock;	/* protects: tq_recv, tq_index */

	spinlock_t lq_update_lock;	/* protects: tq_recv, tq_index */

};



#ifdef CONFIG_BATMAN_ADV_BLA