diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-06-05 16:31:28 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-07-01 16:47:20 -0400 |
commit | 5bf74e9ca1e618afe5a513f64ee4923115e67004 (patch) | |
tree | 6534af43c249344deaf881006b27240fb77ee4c2 /net/batman-adv/vis.c | |
parent | 7f223c0c323a9ac2e88714669994007776e966a8 (diff) |
batman-adv: Prefix hash struct and typedef with batadv_
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/vis.c')
-rw-r--r-- | net/batman-adv/vis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index f5692eef613a..c1fafa3b172f 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c | |||
@@ -91,7 +91,7 @@ static uint32_t batadv_vis_info_choose(const void *data, uint32_t size) | |||
91 | static struct vis_info *batadv_vis_hash_find(struct bat_priv *bat_priv, | 91 | static struct vis_info *batadv_vis_hash_find(struct bat_priv *bat_priv, |
92 | const void *data) | 92 | const void *data) |
93 | { | 93 | { |
94 | struct hashtable_t *hash = bat_priv->vis_hash; | 94 | struct batadv_hashtable *hash = bat_priv->vis_hash; |
95 | struct hlist_head *head; | 95 | struct hlist_head *head; |
96 | struct hlist_node *node; | 96 | struct hlist_node *node; |
97 | struct vis_info *vis_info, *vis_info_tmp = NULL; | 97 | struct vis_info *vis_info, *vis_info_tmp = NULL; |
@@ -247,7 +247,7 @@ int batadv_vis_seq_print_text(struct seq_file *seq, void *offset) | |||
247 | struct hlist_head *head; | 247 | struct hlist_head *head; |
248 | struct net_device *net_dev = (struct net_device *)seq->private; | 248 | struct net_device *net_dev = (struct net_device *)seq->private; |
249 | struct bat_priv *bat_priv = netdev_priv(net_dev); | 249 | struct bat_priv *bat_priv = netdev_priv(net_dev); |
250 | struct hashtable_t *hash = bat_priv->vis_hash; | 250 | struct batadv_hashtable *hash = bat_priv->vis_hash; |
251 | uint32_t i; | 251 | uint32_t i; |
252 | int ret = 0; | 252 | int ret = 0; |
253 | int vis_server = atomic_read(&bat_priv->vis_mode); | 253 | int vis_server = atomic_read(&bat_priv->vis_mode); |
@@ -506,7 +506,7 @@ end: | |||
506 | static int batadv_find_best_vis_server(struct bat_priv *bat_priv, | 506 | static int batadv_find_best_vis_server(struct bat_priv *bat_priv, |
507 | struct vis_info *info) | 507 | struct vis_info *info) |
508 | { | 508 | { |
509 | struct hashtable_t *hash = bat_priv->orig_hash; | 509 | struct batadv_hashtable *hash = bat_priv->orig_hash; |
510 | struct neigh_node *router; | 510 | struct neigh_node *router; |
511 | struct hlist_node *node; | 511 | struct hlist_node *node; |
512 | struct hlist_head *head; | 512 | struct hlist_head *head; |
@@ -559,7 +559,7 @@ static bool batadv_vis_packet_full(const struct vis_info *info) | |||
559 | */ | 559 | */ |
560 | static int batadv_generate_vis_packet(struct bat_priv *bat_priv) | 560 | static int batadv_generate_vis_packet(struct bat_priv *bat_priv) |
561 | { | 561 | { |
562 | struct hashtable_t *hash = bat_priv->orig_hash; | 562 | struct batadv_hashtable *hash = bat_priv->orig_hash; |
563 | struct hlist_node *node; | 563 | struct hlist_node *node; |
564 | struct hlist_head *head; | 564 | struct hlist_head *head; |
565 | struct orig_node *orig_node; | 565 | struct orig_node *orig_node; |
@@ -659,7 +659,7 @@ unlock: | |||
659 | static void batadv_purge_vis_packets(struct bat_priv *bat_priv) | 659 | static void batadv_purge_vis_packets(struct bat_priv *bat_priv) |
660 | { | 660 | { |
661 | uint32_t i; | 661 | uint32_t i; |
662 | struct hashtable_t *hash = bat_priv->vis_hash; | 662 | struct batadv_hashtable *hash = bat_priv->vis_hash; |
663 | struct hlist_node *node, *node_tmp; | 663 | struct hlist_node *node, *node_tmp; |
664 | struct hlist_head *head; | 664 | struct hlist_head *head; |
665 | struct vis_info *info; | 665 | struct vis_info *info; |
@@ -687,7 +687,7 @@ static void batadv_broadcast_vis_packet(struct bat_priv *bat_priv, | |||
687 | struct vis_info *info) | 687 | struct vis_info *info) |
688 | { | 688 | { |
689 | struct neigh_node *router; | 689 | struct neigh_node *router; |
690 | struct hashtable_t *hash = bat_priv->orig_hash; | 690 | struct batadv_hashtable *hash = bat_priv->orig_hash; |
691 | struct hlist_node *node; | 691 | struct hlist_node *node; |
692 | struct hlist_head *head; | 692 | struct hlist_head *head; |
693 | struct orig_node *orig_node; | 693 | struct orig_node *orig_node; |