Skip to contentSkip to conversation

Patch "batman-adv: remove unused callback from batadv_algo_ops struct" has been added to the 4.7-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.7-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.7 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.

Signed-off-by Marek Lindner <[email protected]>
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 |    5 -----
 net/batman-adv/types.h      |    3 ---
 2 files changed, 8 deletions(-)
net/batman-adv/originator.c +0 -5
@@ -251,10 +251,8 @@ static void batadv_neigh_node_release(st
 	struct hlist_node *node_tmp;
 	struct batadv_neigh_node *neigh_node;
 	struct batadv_neigh_ifinfo *neigh_ifinfo;
-	struct batadv_algo_ops *bao;
 
 	neigh_node = container_of(ref, struct batadv_neigh_node, refcount);
-	bao = neigh_node->orig_node->bat_priv->bat_algo_ops;
 
 	hlist_for_each_entry_safe(neigh_ifinfo, node_tmp,
 				  &neigh_node->ifinfo_list, list) {

@@ -263,9 +261,6 @@ static void batadv_neigh_node_release(st
 
 	batadv_hardif_neigh_put(neigh_node->hardif_neigh);
 
-	if (bao->bat_neigh_free)
-		bao->bat_neigh_free(neigh_node);
-
 	batadv_hardif_put(neigh_node->if_incoming);
 
 	kfree_rcu(neigh_node, rcu);
net/batman-adv/types.h +0 -3
@@ -1284,8 +1284,6 @@ struct batadv_forw_packet {
  *  better than neigh2 for their respective outgoing interface from the metric
  *  prospective
  * @bat_neigh_print: print the single hop neighbor list (optional)
- * @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

@@ -1316,7 +1314,6 @@ struct batadv_algo_ops {
 		 struct batadv_neigh_node *neigh2,
 		 struct batadv_hard_iface *if_outgoing2);
 	void (*bat_neigh_print)(struct batadv_priv *priv, struct seq_file *seq);
-	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.7/batman-adv-add-missing-refcnt-for-last_candidate.patch queue-4.7/batman-adv-remove-unused-callback-from-batadv_algo_ops-struct.patch queue-4.7/batman-adv-fix-elp-packet-data-reservation.patch