Skip to content

Commit

Permalink
batman-adv: remove unused callback from batadv_algo_ops struct
Browse files Browse the repository at this point in the history
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
  • Loading branch information
Marek Lindner authored and Simon Wunderlich committed Jun 30, 2016
1 parent 6f0a6b5 commit d9f1798
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
5 changes: 0 additions & 5 deletions net/batman-adv/originator.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,8 @@ static void batadv_neigh_node_release(struct kref *ref)
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) {
Expand All @@ -263,9 +261,6 @@ static void batadv_neigh_node_release(struct kref *ref)

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);
Expand Down
3 changes: 0 additions & 3 deletions net/batman-adv/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -1278,8 +1278,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
Expand Down Expand Up @@ -1310,7 +1308,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);
Expand Down

0 comments on commit d9f1798

Please sign in to comment.