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

Commit 9d7bb7e4 authored by Marek Lindner's avatar Marek Lindner Committed by Greg Kroah-Hartman
Browse files

batman-adv: remove unused callback from batadv_algo_ops struct 



commit d9f179877e50ae2681fe7b0b83e0d9f63b6165ad upstream.

Reported-by: default avatarLars Bußmann <ffsoest@kill-you.net>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
[sven@narfation.org: rewritten commit message to make clear that it is an
 bugfix to an user reported crash]
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bec514a

net/batman-adv/originator.c

+0 −6
Original line number Diff line number Diff line
@@ -197,18 +197,12 @@ static void batadv_neigh_node_release(struct batadv_neigh_node *neigh_node) 
{

	struct hlist_node *node_tmp;

	struct batadv_neigh_ifinfo *neigh_ifinfo;

	struct batadv_algo_ops *bao;



	bao = neigh_node->orig_node->bat_priv->bat_algo_ops;



	hlist_for_each_entry_safe(neigh_ifinfo, node_tmp,

				  &neigh_node->ifinfo_list, list) {

		batadv_neigh_ifinfo_free_ref(neigh_ifinfo);

	}



	if (bao->bat_neigh_free)

		bao->bat_neigh_free(neigh_node);



	batadv_hardif_free_ref(neigh_node->if_incoming);



	kfree_rcu(neigh_node, rcu);

net/batman-adv/types.h

+0 −3
Original line number Diff line number Diff line
@@ -1136,8 +1136,6 @@ struct batadv_forw_packet { 
 * @bat_neigh_is_equiv_or_better: check if neigh1 is equally good or better

 *  than neigh2 for their respective outgoing interface from the metric

 *  prospective

 * @bat_neigh_free: free the resources allocated by the routing algorithm for a

 *  neigh_node object

 * @bat_orig_print: print the originator table (optional)

 * @bat_orig_free: free the resources allocated by the routing algorithm for an

 *  orig_node object
@@ -1165,7 +1163,6 @@ struct batadv_algo_ops { 
		 struct batadv_hard_iface *if_outgoing1,

		 struct batadv_neigh_node *neigh2,

		 struct batadv_hard_iface *if_outgoing2);

	void (*bat_neigh_free)(struct batadv_neigh_node *neigh);

	/* orig_node handling API */

	void (*bat_orig_print)(struct batadv_priv *priv, struct seq_file *seq,

			       struct batadv_hard_iface *hard_iface);