aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/vis.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/vis.c')
-rw-r--r--net/batman-adv/vis.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 619f0a5a8484..e0a90570d667 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -433,8 +433,8 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv,
433 } 433 }
434 } 434 }
435 /* remove old entry */ 435 /* remove old entry */
436 hash_remove(bat_priv->vis_hash, vis_info_cmp, vis_info_choose, 436 batadv_hash_remove(bat_priv->vis_hash, vis_info_cmp,
437 old_info); 437 vis_info_choose, old_info);
438 send_list_del(old_info); 438 send_list_del(old_info);
439 kref_put(&old_info->refcount, free_info); 439 kref_put(&old_info->refcount, free_info);
440 } 440 }
@@ -474,8 +474,8 @@ static struct vis_info *add_packet(struct bat_priv *bat_priv,
474 recv_list_add(bat_priv, &info->recv_list, packet->sender_orig); 474 recv_list_add(bat_priv, &info->recv_list, packet->sender_orig);
475 475
476 /* try to add it */ 476 /* try to add it */
477 hash_added = hash_add(bat_priv->vis_hash, vis_info_cmp, vis_info_choose, 477 hash_added = batadv_hash_add(bat_priv->vis_hash, vis_info_cmp,
478 info, &info->hash_entry); 478 vis_info_choose, info, &info->hash_entry);
479 if (hash_added != 0) { 479 if (hash_added != 0) {
480 /* did not work (for some reason) */ 480 /* did not work (for some reason) */
481 kref_put(&info->refcount, free_info); 481 kref_put(&info->refcount, free_info);
@@ -934,9 +934,9 @@ int batadv_vis_init(struct bat_priv *bat_priv)
934 934
935 INIT_LIST_HEAD(&bat_priv->vis_send_list); 935 INIT_LIST_HEAD(&bat_priv->vis_send_list);
936 936
937 hash_added = hash_add(bat_priv->vis_hash, vis_info_cmp, vis_info_choose, 937 hash_added = batadv_hash_add(bat_priv->vis_hash, vis_info_cmp,
938 bat_priv->my_vis_info, 938 vis_info_choose, bat_priv->my_vis_info,
939 &bat_priv->my_vis_info->hash_entry); 939 &bat_priv->my_vis_info->hash_entry);
940 if (hash_added != 0) { 940 if (hash_added != 0) {
941 pr_err("Can't add own vis packet into hash\n"); 941 pr_err("Can't add own vis packet into hash\n");
942 /* not in hash, need to remove it manually. */ 942 /* not in hash, need to remove it manually. */
@@ -977,7 +977,7 @@ void batadv_vis_quit(struct bat_priv *bat_priv)
977 977
978 spin_lock_bh(&bat_priv->vis_hash_lock); 978 spin_lock_bh(&bat_priv->vis_hash_lock);
979 /* properly remove, kill timers ... */ 979 /* properly remove, kill timers ... */
980 hash_delete(bat_priv->vis_hash, free_info_ref, NULL); 980 batadv_hash_delete(bat_priv->vis_hash, free_info_ref, NULL);
981 bat_priv->vis_hash = NULL; 981 bat_priv->vis_hash = NULL;
982 bat_priv->my_vis_info = NULL; 982 bat_priv->my_vis_info = NULL;
983 spin_unlock_bh(&bat_priv->vis_hash_lock); 983 spin_unlock_bh(&bat_priv->vis_hash_lock);