aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarek Lindner <lindner_marek@yahoo.de>2012-12-25 04:03:22 -0500
committerAntonio Quartulli <ordex@autistici.org>2013-01-19 08:18:10 -0500
commit015b4ae4a36bb5ee62187ac6e2f193e87d225516 (patch)
tree38d0642b63f466d8f8c2886fec70292e1ae621a8 /net
parent2006fea82085cfd9ddc92b23ef1ea8d57e065c61 (diff)
batman-adv: rename batadv_if_list_entry struct to make clear it is used by vis
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Diffstat (limited to 'net')
-rw-r--r--net/batman-adv/types.h19
-rw-r--r--net/batman-adv/vis.c8
2 files changed, 14 insertions, 13 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 9a66115bd9c5..d17517c79d3c 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -426,15 +426,6 @@ struct batadv_forw_packet {
426 struct batadv_hard_iface *if_incoming; 426 struct batadv_hard_iface *if_incoming;
427}; 427};
428 428
429/* While scanning for vis-entries of a particular vis-originator
430 * this list collects its interfaces to create a subgraph/cluster
431 * out of them later
432 */
433struct batadv_if_list_entry {
434 uint8_t addr[ETH_ALEN];
435 bool primary;
436 struct hlist_node list;
437};
438struct batadv_frag_packet_list_entry { 429struct batadv_frag_packet_list_entry {
439 struct list_head list; 430 struct list_head list;
440 uint16_t seqno; 431 uint16_t seqno;
@@ -467,6 +458,16 @@ struct batadv_recvlist_node {
467 uint8_t mac[ETH_ALEN]; 458 uint8_t mac[ETH_ALEN];
468}; 459};
469 460
461/* While scanning for vis-entries of a particular vis-originator
462 * this list collects its interfaces to create a subgraph/cluster
463 * out of them later
464 */
465struct batadv_vis_if_list_entry {
466 uint8_t addr[ETH_ALEN];
467 bool primary;
468 struct hlist_node list;
469};
470
470struct batadv_algo_ops { 471struct batadv_algo_ops {
471 struct hlist_node list; 472 struct hlist_node list;
472 char *name; 473 char *name;
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 51e2bf01c919..3d42b17ede08 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -127,7 +127,7 @@ static void batadv_vis_data_insert_interface(const uint8_t *interface,
127 struct hlist_head *if_list, 127 struct hlist_head *if_list,
128 bool primary) 128 bool primary)
129{ 129{
130 struct batadv_if_list_entry *entry; 130 struct batadv_vis_if_list_entry *entry;
131 struct hlist_node *pos; 131 struct hlist_node *pos;
132 132
133 hlist_for_each_entry(entry, pos, if_list, list) { 133 hlist_for_each_entry(entry, pos, if_list, list) {
@@ -147,7 +147,7 @@ static void batadv_vis_data_insert_interface(const uint8_t *interface,
147static void batadv_vis_data_read_prim_sec(struct seq_file *seq, 147static void batadv_vis_data_read_prim_sec(struct seq_file *seq,
148 const struct hlist_head *if_list) 148 const struct hlist_head *if_list)
149{ 149{
150 struct batadv_if_list_entry *entry; 150 struct batadv_vis_if_list_entry *entry;
151 struct hlist_node *pos; 151 struct hlist_node *pos;
152 152
153 hlist_for_each_entry(entry, pos, if_list, list) { 153 hlist_for_each_entry(entry, pos, if_list, list) {
@@ -197,7 +197,7 @@ static void batadv_vis_data_read_entries(struct seq_file *seq,
197 struct batadv_vis_info_entry *entries) 197 struct batadv_vis_info_entry *entries)
198{ 198{
199 int i; 199 int i;
200 struct batadv_if_list_entry *entry; 200 struct batadv_vis_if_list_entry *entry;
201 struct hlist_node *pos; 201 struct hlist_node *pos;
202 202
203 hlist_for_each_entry(entry, pos, list, list) { 203 hlist_for_each_entry(entry, pos, list, list) {
@@ -223,7 +223,7 @@ static void batadv_vis_seq_print_text_bucket(struct seq_file *seq,
223 struct batadv_vis_packet *packet; 223 struct batadv_vis_packet *packet;
224 uint8_t *entries_pos; 224 uint8_t *entries_pos;
225 struct batadv_vis_info_entry *entries; 225 struct batadv_vis_info_entry *entries;
226 struct batadv_if_list_entry *entry; 226 struct batadv_vis_if_list_entry *entry;
227 struct hlist_node *pos, *n; 227 struct hlist_node *pos, *n;
228 228
229 HLIST_HEAD(vis_if_list); 229 HLIST_HEAD(vis_if_list);