Skip to content

Commit d9f1798

Browse files
Marek Lindnersimonwunderlich
authored andcommitted
batman-adv: remove unused callback from batadv_algo_ops struct
Signed-off-by: Marek Lindner <[email protected]> Signed-off-by: Sven Eckelmann <[email protected]> Signed-off-by: Simon Wunderlich <[email protected]>
1 parent 6f0a6b5 commit d9f1798

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

net/batman-adv/originator.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,8 @@ static void batadv_neigh_node_release(struct kref *ref)
251251
struct hlist_node *node_tmp;
252252
struct batadv_neigh_node *neigh_node;
253253
struct batadv_neigh_ifinfo *neigh_ifinfo;
254-
struct batadv_algo_ops *bao;
255254

256255
neigh_node = container_of(ref, struct batadv_neigh_node, refcount);
257-
bao = neigh_node->orig_node->bat_priv->bat_algo_ops;
258256

259257
hlist_for_each_entry_safe(neigh_ifinfo, node_tmp,
260258
&neigh_node->ifinfo_list, list) {
@@ -263,9 +261,6 @@ static void batadv_neigh_node_release(struct kref *ref)
263261

264262
batadv_hardif_neigh_put(neigh_node->hardif_neigh);
265263

266-
if (bao->bat_neigh_free)
267-
bao->bat_neigh_free(neigh_node);
268-
269264
batadv_hardif_put(neigh_node->if_incoming);
270265

271266
kfree_rcu(neigh_node, rcu);

net/batman-adv/types.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,8 +1278,6 @@ struct batadv_forw_packet {
12781278
* better than neigh2 for their respective outgoing interface from the metric
12791279
* prospective
12801280
* @bat_neigh_print: print the single hop neighbor list (optional)
1281-
* @bat_neigh_free: free the resources allocated by the routing algorithm for a
1282-
* neigh_node object
12831281
* @bat_orig_print: print the originator table (optional)
12841282
* @bat_orig_free: free the resources allocated by the routing algorithm for an
12851283
* orig_node object
@@ -1310,7 +1308,6 @@ struct batadv_algo_ops {
13101308
struct batadv_neigh_node *neigh2,
13111309
struct batadv_hard_iface *if_outgoing2);
13121310
void (*bat_neigh_print)(struct batadv_priv *priv, struct seq_file *seq);
1313-
void (*bat_neigh_free)(struct batadv_neigh_node *neigh);
13141311
/* orig_node handling API */
13151312
void (*bat_orig_print)(struct batadv_priv *priv, struct seq_file *seq,
13161313
struct batadv_hard_iface *hard_iface);

0 commit comments

Comments
 (0)