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

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

batman-adv: Rename batadv_tvlv_handler *_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 3a01743d

net/batman-adv/main.c

+6 −7
Original line number Diff line number Diff line
@@ -638,12 +638,11 @@ static void batadv_tvlv_handler_release(struct kref *ref) 
}



/**

 * batadv_tvlv_handler_free_ref - decrement the tvlv container refcounter and

 * batadv_tvlv_handler_put - decrement the tvlv container refcounter and

 *  possibly release it

 * @tvlv_handler: the tvlv handler to free

 */

static void

batadv_tvlv_handler_free_ref(struct batadv_tvlv_handler *tvlv_handler)

static void batadv_tvlv_handler_put(struct batadv_tvlv_handler *tvlv_handler)

{

	kref_put(&tvlv_handler->refcount, batadv_tvlv_handler_release);

}
@@ -1031,7 +1030,7 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, 
						src, dst, tvlv_value,

						tvlv_value_cont_len);

		if (tvlv_handler)

			batadv_tvlv_handler_free_ref(tvlv_handler);

			batadv_tvlv_handler_put(tvlv_handler);

		tvlv_value = (u8 *)tvlv_value + tvlv_value_cont_len;

		tvlv_value_len -= tvlv_value_cont_len;

	}
@@ -1111,7 +1110,7 @@ void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, 


	tvlv_handler = batadv_tvlv_handler_get(bat_priv, type, version);

	if (tvlv_handler) {

		batadv_tvlv_handler_free_ref(tvlv_handler);

		batadv_tvlv_handler_put(tvlv_handler);

		return;

	}
@@ -1148,11 +1147,11 @@ void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv, 
	if (!tvlv_handler)

		return;



	batadv_tvlv_handler_free_ref(tvlv_handler);

	batadv_tvlv_handler_put(tvlv_handler);

	spin_lock_bh(&bat_priv->tvlv.handler_list_lock);

	hlist_del_rcu(&tvlv_handler->list);

	spin_unlock_bh(&bat_priv->tvlv.handler_list_lock);

	batadv_tvlv_handler_free_ref(tvlv_handler);

	batadv_tvlv_handler_put(tvlv_handler);

}



/**