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

Commit 21754e25 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put 



The batman-adv source code is the only place in the kernel which uses the
*_free_ref naming scheme for the *_put functions. Changing it to *_put
makes it more consistent and makes it easier to understand the connection
to the *_get functions.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 5fff2825

net/batman-adv/originator.c

+4 −4
Original line number Diff line number Diff line
@@ -151,11 +151,11 @@ static void batadv_orig_node_vlan_release(struct kref *ref) 
}



/**

 * batadv_orig_node_vlan_free_ref - decrement the refcounter and possibly

 *  release the originator-vlan object

 * batadv_orig_node_vlan_put - decrement the refcounter and possibly release

 *  the originator-vlan object

 * @orig_vlan: the originator-vlan object to release

 */

void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan)

void batadv_orig_node_vlan_put(struct batadv_orig_node_vlan *orig_vlan)

{

	kref_put(&orig_vlan->refcount, batadv_orig_node_vlan_release);

}
@@ -917,7 +917,7 @@ struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, 
	 * Immediately release vlan since it is not needed anymore in this

	 * context

	 */

	batadv_orig_node_vlan_free_ref(vlan);

	batadv_orig_node_vlan_put(vlan);



	for (i = 0; i < BATADV_FRAG_BUFFER_COUNT; i++) {

		INIT_HLIST_HEAD(&orig_node->fragments[i].head);

net/batman-adv/originator.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node, 
struct batadv_orig_node_vlan *

batadv_orig_node_vlan_get(struct batadv_orig_node *orig_node,

			  unsigned short vid);

void batadv_orig_node_vlan_free_ref(struct batadv_orig_node_vlan *orig_vlan);

void batadv_orig_node_vlan_put(struct batadv_orig_node_vlan *orig_vlan);



/* hashfunction to choose an entry in a hash table of given size

 * hash algorithm from http://en.wikipedia.org/wiki/Hash_table

net/batman-adv/translation-table.c

+5 −5
Original line number Diff line number Diff line
@@ -348,12 +348,12 @@ static void batadv_tt_global_size_mod(struct batadv_orig_node *orig_node, 
		spin_lock_bh(&orig_node->vlan_list_lock);

		if (!hlist_unhashed(&vlan->list)) {

			hlist_del_init_rcu(&vlan->list);

			batadv_orig_node_vlan_free_ref(vlan);

			batadv_orig_node_vlan_put(vlan);

		}

		spin_unlock_bh(&orig_node->vlan_list_lock);

	}



	batadv_orig_node_vlan_free_ref(vlan);

	batadv_orig_node_vlan_put(vlan);

}



/**
@@ -1652,7 +1652,7 @@ batadv_tt_global_print_entry(struct batadv_priv *bat_priv, 
			   ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),

			   ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));



		batadv_orig_node_vlan_free_ref(vlan);

		batadv_orig_node_vlan_put(vlan);

	}



print_list:
@@ -1684,7 +1684,7 @@ batadv_tt_global_print_entry(struct batadv_priv *bat_priv, 
			   ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'),

			   ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.'));



		batadv_orig_node_vlan_free_ref(vlan);

		batadv_orig_node_vlan_put(vlan);

	}

}
@@ -2503,7 +2503,7 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, 
			return false;



		crc = vlan->tt.crc;

		batadv_orig_node_vlan_free_ref(vlan);

		batadv_orig_node_vlan_put(vlan);



		if (crc != ntohl(tt_vlan_tmp->crc))

			return false;