diff options
| author | Marek Lindner <mareklindner@neomailbox.ch> | 2016-05-02 21:58:50 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-07 15:21:27 +0200 |
| commit | 30131b1fa0916a5bf9bcae5e53c5b46b8ee909cf (patch) | |
| tree | dcfbf0fd279bb14cbfe342d2cc0575d98eda1c27 | |
| parent | 11e4257d6f382b890d872bd8c9fa5c9f266ce2b9 (diff) | |
| download | lwn-30131b1fa0916a5bf9bcae5e53c5b46b8ee909cf.tar.gz lwn-30131b1fa0916a5bf9bcae5e53c5b46b8ee909cf.zip | |
batman-adv: remove unused callback from batadv_algo_ops struct
commit d9f179877e50ae2681fe7b0b83e0d9f63b6165ad upstream.
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/batman-adv/originator.c | 5 | ||||
| -rw-r--r-- | net/batman-adv/types.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index ab8c4f9738fe..1da7bfc61ac6 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -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) { @@ -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); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 74d865a4df46..40aed16fbc28 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -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); |