Skip to contentSkip to conversation

Patch "batman-adv: remove unused callback from batadv_algo_ops struct" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 5, 2016

Subsystems (2)
Stable branch Batman advanced
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

batman-adv: remove unused callback from batadv_algo_ops struct

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
batman-adv-remove-unused-callback-from-batadv_algo_ops-struct.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From d9f179877e50ae2681fe7b0b83e0d9f63b6165ad Mon Sep 17 00:00:00 2001

From: Marek Lindner <[email protected]>
Date: Mon, 2 May 2016 21:58:50 +0800
Subject: batman-adv: remove unused callback from batadv_algo_ops struct

From: Marek Lindner <[email protected]>

commit d9f179877e50ae2681fe7b0b83e0d9f63b6165ad upstream.

Reported-by Lars Bußmann <[email protected]>
Signed-off-by Marek Lindner <[email protected]>

[[email protected]: rewritten commit message to make clear that it is an
bugfix to an user reported crash]

Signed-off-by Sven Eckelmann <[email protected]>
Signed-off-by Simon Wunderlich <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 net/batman-adv/originator.c |    6 ------
 net/batman-adv/types.h      |    3 ---
 2 files changed, 9 deletions(-)
net/batman-adv/originator.c +0 -6
@@ -197,18 +197,12 @@ static void batadv_neigh_node_release(st
 {
 	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
@@ -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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/batman-adv-remove-unused-callback-from-batadv_algo_ops-struct.patch